Test refactoring
New join tests
Fixing mess after running some test