Be lighter on database when testing connection pools

Change-Id: Ie86ea0d8de09b136ac957a07218c1d8930357f46
Merge "Be lighter on database when testing connection pools"