Add test
Restructure HashJoinBatch