Fixing some of the random order tests