added a few more tests, cleaned controller.