hapi 6 adjustments and code coverage improvements

Keep at 2.2.0.... we haven't pushed this version yet