Fix order of tests