Updated tests to mitigate against db latency