[Test] Cleanup
[Test] Improve stability