[Andrei,Ronald] cleanup Test