Add more tests for coverage

Bug: 151448144
Test: run
Change-Id: I3af0385476b191b4fa9fa025e9f2cc45fefecdf1
3 files changed