converted to maven project; refactored a bit in controller and controller tests; added mockito to properly unit test controller