Remove venuegroup selection after it's set, fix tests.