Better unit test coverage: 87%.