Fix tests after recent refactors