remove flaky testcase and restructure the random usage to minimize
locking between batches