Merge "Updated Test and Setup files for PM Mapper"