hapi 6 adjustments and code coverage improvements

Please delete instead of commenting out