Add some missing cleaning
Rename a mis-named test