Improve code coverage

Change-Id: I5b22ec3463fcac717f6fc1c5dab02dff0211a098