Touch up phpunit tests