Create environment dialog and tests refactoring according dialog