Port some joining tests over from gamed