Refactored specs