Add search test, change tests