Revert "Update clustering tests for Continuous Integration"