Phpunit cleanups