Some changes for db testing