DVPL-5298 | Robustify test suite.