clean up of tests. push request responsibility to controller.