[Test] Cleanup