Mapping Unit-Test fixed