Scrub acceptedTC, fix intermittent test failure