Fix Mapping Unit-Test