Speeding up multi ha test and fixing retries