made adaptions in controller and adapted tests