Unit test work

Change-Id: I9df3d0d717e6646013d28d28d5a7b485ab25276f