tests + custom mapper for comparison

@aaditmshah