Fix testcases for -x/--make-ha