(Frodo) Lots more tests, among them one for ambiguous long options, which fails without the just committed bugfix.