Fix up config assistant
Fix up Config Assistant test cases