Fixing tests when they run out of order