Merge "JUnits for Mapper_2_0"