More cleanup on the test-containerizer.