Refactored Garage spec