tidying up skipped tests
Merge branch 'master' into controller_testing
Merge pull request #46 from nairys/controller_testing

Controller testing