seperate controller/request spec and refactor specs