more tests and some bug fixes
Merge branch 'master' of github.com:dickhardt/A2P3