fix many mapping
add failing test for 2 row join result
pass a few more tests