Fix sanity regression tests