fix #550 reorder some tests

Change order of the tests so the long ones do not block the whole campaign at the end. Speeds up the whole campaign by ~20s (from 2m10s to 1m49 on my machine) on 8 CPUs.

Related to #538.