Improve code coverage

Change-Id: Ib9d2b8c40df6c26160e8d609c10a1260dd773b8f