Improving test coverage.

82% test coverage.