more code coverage and tests.