Search tests almost complete, other tests modified slightly