More cleanup of tests