Fix timeout issue and speed up UT on my box