Merge "Improve test efficiency and stablility"