working on db testing fixes