Improve code coverage

Change-Id: I665859553db834c086e8fcbc0e5290fa1bc304f6