Add test case for hyphenated option names

Add some tests to show the broken behaviour in #127993 and to help
ensure that fixing it doesn't break correct behaviour in other places.

Related-Bug: #1279973
Change-Id: I69b2c4e3f27a3e193ca10cef32dd752d6a6fcc8b
Remove print statement from types.Dict

Probably left after some debugging session.

Change-Id: I8aa427b5f61f695d1c2fed016816844efeea7b8b
Closes-bug: #1331449
Merge "Remove print statement from types.Dict"
Merge "Add test case for hyphenated option names"