Fix RF tests