Initial controller tests written and pass
Merge branch 'master' into controller_tests
Merge pull request #39 from JeuelyFish/controller_tests

Controller tests