Test: Change space between parts
Improve cmdline parsing