Bug 24786: (QA follow-up) Ensure tests pass with existing data