Now shooting for 80 percent unit test coverage. [ci skip]