Add test for case for parameters containing empty string value in config files
Minor refactoring