Fixed #66 and removed the TestController.