Tidy for clustering test suite.