Revert Mapper fix + update tests