More robustness for the full comprehensive testing.
Changelog.