Update sanitytest to use the test infrastructure