Fix sanity tests