Increasing code coverage and cleaning up a few things.