fix util test
fix util test

By stripping the left dashes AFTER we remove improper characters
we can get back something sane, so round-tripping doesn't
cause further modifications.

Change-Id: I35d3d1f445349a47b8d73a6ddcfc093c14031bf3

google/caliban,google/caliban