Clean up and change order of tests