CB 6141 - Fix tests on windows + readable cmd arguments

ok to merge?