Merge "Refactor PM Mapper tests"