Add test for config merging