Make tests pass when run sequentially