Local/Global configuration + test cases
Fixed descriptions
Capitalize one of two arguments with same first char