Improve code coverage

Change-Id: Ic02fe0bf8694b3f6da3bc39f9b6dd8565bfb0e2a