add Search handler and first tests