added tests
added tests
Merge pull request #132 from acjetnut/controller-tests

Controller tests