Rearrange tests to see whether it solves the voodo failures.