hapi 6 adjustments and code coverage improvements

please delete instead of commenting out