envuser is now environment user, improved comments and tests