Improve test key names to reproduce public issue

Also fixes other unrelated test failures.

Bug: http://code.google.com/p/android/issues/detail?id=34577
Bug: 6837950

Change-Id: I2c5ed1cbfbe0ab6f4ddd8619696d6545be0519a8
1 file changed