Unit test work

Change-Id: I5083b7f2d8d1876a773bf4c4b90ba78e1b383f97