Continuing to add environment tests