Fix clustering test