Test case cleanup, additional code coverage.