Improved join tests