[#XDSB-121] Cleanup config parameter. Correct unit test