Fix tests after style refactoring