improved tests
Merge branch 'master' of https://github.com/rii-mango/Papaya