Cleanup

Wrote a couple of simple tests.