[PTFM-8997] Test setup fixes