Merge pull request #45 from nairys/controller_testing

controller & model testing
tidying up skipped tests
Merge branch 'master' into controller_testing