Before refactoring to keep DB as a Promise
All tests are passing