Improve F-F test program and fix test data files