DB service refactoring
DB service tests (skeleton)