Make setup code a bit nicer in TestController.
Remove more unnecessary code in TestController.
Merge branch 'master' into development