Fixed bugs in Controller while fixing the broken ControllerTest. Also fixed FinderTest.