Make tests independent of execution order