DB Test speed-up