Merge pull request #148 from lloydbenson/master

hapi 6 adjustments and code coverage improvements