Fix map delegate tests