various tests added
Merge branch 'master' into controller_testing
deleted pending tests
Merge pull request #45 from nairys/controller_testing

controller & model testing