Unit test enviro config fixes