Add integration tests for clustering

[Boarders]

Add the new clustering options (once merged) to the integration tests.