Moved tests around; added new search test.