Updated db config option names, removed redundant configuration.

Cleaned up integration test config files as well.