Change order of some tests