Improved MVC tests.