Refactored cucumber specs