Fix collapse issue in test-suite.