Improve some tests

This CL fixes some tests that are failing in the emulator

Bug: 20857006
Change-Id: I8f669678403e33d16af3e2de29851d6fcc7cab13
4 files changed