improve unit test coverage

Bug: 159263116
Test: atest
Change-Id: If71073902d020562989fc40631929688a63d0a47
2 files changed