Additional tests to plug holes in coverage.