Adding join support and join test case