Made db tests more cannonical.