Added unit tests for search
Added unit tests for retrieve