Merge "Don't reset name tables between test runs."