controller and unit tests done