hapi 6 adjustments and code coverage improvements

This should match the same check that is done here: https://github.com/spumko/good/pull/148/files#diff-9a3ce09856114605620e98d815bd93e1R91