Merge "Fix reference config before initialization in cli tests"