database converter refactoring
temporary database tests refactoring