Prep for 5.8 release
Restore 100% test coverage.