Refactoring dbap tests to use new testpackage #552