Work on fuller test coverage.