refactored specs