Merge "Improve NewDatabasePerformanceTests"