Refactoring; Db tests;