improved PHPUnit tests