Matt: fixing unit test for controllers