revised inheritance strategy in test domain
Merge branch 'master' into 2.0. Pulled latest fixes from master