Fix tests using ff