Sanity test clean up