Spec tests fixed after style refactoring