Add missing cleanup causing test failures