Implemented more Controller tests
Merge remote-tracking branch 'Chris/master'