Refactor request specs