Add one more test and update old tests

This is just updating the internal test app.
No real functionality changed.

b/17631551

Change-Id: Icc01e017ea4fbf97712214e6ac02691d29ea5e96
4 files changed