More unit test work

Change-Id: I1b075f81db412aa80de1f11511b7b08ee1ca423b