db refactoring
fix tests