latest version of tests, some fixes
Merge branch 'master' of github.com:pamepros/example-tests