Extended config metamodel. Re-creating lost changes.
Ammended code to use new config-mm
Fixed test data to conform to the new configuration mm. Fixed typo in config mm.