A little more cleanup of the test directory.