test clean up and enhancement
Merge pull request #2052 from gurbuzali/low-pool-size-test/3.2-RC3

test clean up and enhancement