Fixed db tool and updated test schema.