[Test] Improve performance and stability