Moved tests, test for Search has to be thought through