**Many** tests are failing! Committing so I can merge dev into this branch
Generic single-database configuration.