Environment service tests completed, Application update to use EnvironmentService as core