More tests
Merge branch 'master' of github.com:c9s/Pux