Improve test coverage

Change-Id: Iead71cee468d78aa52aad66e23e0acffa2df4a52