Create the new controller tests. Fix several tests that failed because of new code
Merge pull request #25 from LinkyXoth/CONTROLLER_TESTS

Controller tests & test fixes