[21.5] (fixed) Test Suite Failures - database tests