Fixing/skipping controller tests.