Modify TestAppEnv.java & TestAppEnvironmentTest.java