fixing and asserting cleanup