Fix tests due to MVC team's shoddy code