Fixed phpunit bootstrap, added some bogus tests
Merge branch '1.8.1'