fixed some tests
Merge branch 'dev' of github.com:snwfog/ppedit into dev
fixed merge