Adding controller tests
Merge pull request #98 from reviewninja/feature/tests

Adding controller tests