Changed order of the test controller.