removed domain with enumeration test, handled domain with embedded properties