Fixing F tests