Clean up test directory.

Adds to #2.
Clean up more quietly.

Adds to #2.