Fix travis and add fixed org tests related to environments