changes to make incoming db handler tests work more reliably

Signed-off-by: Jim Klo <jim.klo@sri.com>