Further join tests & fixes