Merge pull request #3 from wpreul/master

Updating to lab 3 and adding tests
Support hapi 6