search tests
search tests and bug fixes