Controller tests

Moved Json....also created a bunch of tests, which obviously aren't related