Don't clean anything yet.
Fixed possible test bug (tests not yet refactored)