Refactoring more specs