Add an additional test case

Remerge against master and fix compile errors.  Also correct identifier
validation against EnvironmentDescriptions