Update spec/Mapper to match with new Registry #166
Update spec/Merger to match with new Registry #166