Fixes for F-test