Environment model refactoring
Temporary disable environment test