Clean up and put the test controller back (where did it go?!?!)