Partial reworking of EnvSimple tests