@jimfulton let me add new tests first as listed in your comment and a few more corner case and amend the parsing accordingly afterwards