Add andMap and orMap tests