Fix ftests.

@rev dwidjaja@
Merging origin/goliver/master-pending-fix-tests into master