Clean up a few things, and experiment with code coverage