Unit test work

Change-Id: Idb04716e8064eaa3f7c34571b109fa641bd2d378