phpunit fixes - test pass