* More unittests for better coverage of parser(s)
* More unittests