Test fix for db issues