DB and test fix