Changed order of tests