Fixing MemberServerResource and tests