Allow multiple hyphens in a row, and add more parse tests