Merge "Add unit test for config file validation"