Change order of tests