Merge "Test runner cleanup: delete unused old classes."