Ftest fixes