More cleanup tests