Fixing/skipping controller tests.
Merge pull request #260 from ngodfraind/fixing-tests

Fixing/skipping controller tests.