Remove more uses of parenvs in tests