Increased unit test coverage

Change-Id: I6d3f373d999a2e29ad9421b22d9832176d92d990
Merge "Increased unit test coverage"