renaming test files, fixing search tests