Test flow fixes