modified tests to finally work and created controller class