Get documentProvider.dropDatabase and tests
Fix merge snafu