Merge "Convert cli tests to use global CONF object"