Handle restart/inconsistent data in test_count