Fixed help message parsing; updated tests
Merged