[REF] Extend testing on membership batch entry & minor cleanup