Test Fixes - cluster-smoke