model testing
updated test merge
Merge pull request #2 from pbyrne222/master

updated tests controller