agent: Fixing UiDir in test
agent: Fixing config merge test
agent: Fixing wan join tests