Modified some more unit tests to get more code coverage.