Added GroupJoin tests and renamed a couple of things