Refactored specs for clarity