Fixing TestController tests.