Merge "tests: Remove some unused stuff in phpunit tests"