Cleaning up after the content tests.
Merge pull request #14 from generalredneck/cleanup

Cleaning up after the content tests.