Added tests for searching