Add clustering changes to tests