Moved classes to reuse in other tests
MapKeyCustomEnumTypeTest test case
Fix MapKeyCustomEnumTypeTest