took out all in controller
Strengthened tests and added matcher