TJ/JPM: another test and fixes for joining on optional key.