add config_override, update test helpers
Merge pull request #1076 from Tendrid/develop

add config_override, update test helpers