added test_directory/test_file
fix merge