Test cluster finished; refactor redundant code soon