Updated databasePopulator and tests.