Some more fixes to CLI kwarg paring and it's tests