Improve code coverage

Change-Id: I985c2048e0a0f19af85bb82a70917967939da793