Getting Legacy Search Tests running again