progress on controller/tests