BUG 2344 : Refactor Clustering integration tests