Bug fix (proper extending of tests when dbms is known)