Update runcluster and cleanup umake test expected results