Updated search tests to match updated api
Repackaged for saner imports