Refactored station spec