Updated PHPUnit tests