Added tests; corrected Search interface