fixes in controller testing