[Zurich] don't hardcode division ID in cleanup()
Fix test breakage

for Zurich tests, count how many reports already exist as a baseline.