wrapped up model testing and did some controller testing
Merge pull request #21 from nairys/controller_testing

wrapped up model testing and did some controller testing