Updating w.r.t. the no-local tests that just came in