controller tests
updated models
Merge pull request #5 from SyntaxStacks/testRefactor

controller tests