PropertyMocker minor refactor
moved Default out of EntityMappingsMocker