After 18 April am I correct to say that the predepature covid test for return to Aust has been scrapped.