More mapper tests