Fixed failing tests from moving search over