ConfigService, EnvironmentService tests added, misc fixes