worked on controller and tests