tests repaired
Merge branch 'master' of github.com:maskrz/ZPI