Test script change only.

Improved the test scripts robustness by better enforcement of initial conditions,
to prevent spurious failures.