Changing the join to behave correctly, adding two test cases