Closes #5

Merge test changes by @lloydbenson
Update package.json

Un-botch missed commit by @lloydbenson
Merge pull request #7 from hapijs/pr/6

Closes #5, thank you @lloydbenson.