Sanity test changes