update tests to conform to MVC refactor