Some more cleanup on the test-containerizer.