Done majority of the controller testing