Allow for easier customization of DB connection values for testing - part 2