Increased code coverage, some improvements to existing tests.