Adds search test. Removes exsisting. Fixes issues on search result (ambiguity).