Updated Environment files and tests