Updated travis-ci conf, phpunit.xml, and tests
Argh