hapi 6 adjustments and code coverage improvements

Might as well delete this