Database tests nearly done, cosmetic DbManager changes.