Fill gaps in unit tests

This completes the incomplete tests and
 expands test coverage

Change-Id: I40c201a8df9aa13086939c32707b898f6342d7bf