Fix failing tests, make_source_file_name uses sfx() function