More tests
Merge branch 'master' of github.com:spumko/joi

Merging upstream
Fixing failing test