Get test suite coverage to 100%

Take the opportunity to push coverage before embarking on the 3D
transform.