Added more join tests and fixed formatting and docblocks