Change modified flow in cluster test