Refactoring specs