Removed unused definition of expected_files
Rewrote test_file_search() to more explicitly check the the result
is the path + the correct file name.
The use of magic numbers in the indexing of strings has been removed.