Switched over to use common version of test class MappingExtensionImpl