Fix a race in TestCollector where it didn't wait for the config info to drop, also coalesce tests to cut down setup time.