Merge "Convert scenario tests to use global CONF object"