Fixing Database Test procedure