Fixed few cosmetic warnings in Controller, removed unnecessary code form AgentTest, started to fill ControllerTest with code.