Improve code coverage

Change-Id: I5277756f78c09d15b052a42e3fd172628ba8a016