Reallign all the test code