Moved the test controller to the right package

Some tidying up round the edges