AddMember support and improved testing