Working controller tests for new Rocket Pants stuff
some code re-arranging but all tests pass