DB-related refactoring
more test dummies