Added Join and improved test