Fix YamlDataSet issues in PHPUnit tests