use inferred graph for search also
fix test numbers again