Make tests pass when run in batch mode (i.e. in isolation)