Minor updates to RFT testing