Updated unit tests for search