phpunit and o+ improvements