Add tests for config dict merging
Add tests for configuration handling