Specs

* Improvements to model specs
* refactor controllers - move json generation from controller to respective models