hapi 6 adjustments and code coverage improvements