Added org support to envs module and few tests