Refactored testing framework to allow multiple controllers to be instantiated per test file.  Way friendlier towards mocks.