few touchups
moved tests
Merge branch 'master' of github.com:thornag/php-project