Made YaPI Read predictable for testsuite needs.
Adapted testsuite.