Added changes from Dropwizard/DWMongo pre-test-change