More refactoring filenames.  Splitting test_fmd method apart (WIP).