Change order of tests in build