Some more unit test work

Change-Id: I5c94ce096cbd8ee470333b75ce92526dae33f8b0