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

(cherry-picked from f4019af0)

Change-Id: I5b32b5ccac80f04a4d0fd6b21b8caa11e42995a7