Join refactor and more tests
Join cleanup
Cleanup
Cleanup