unit tests working

Change-Id: Ibca0613cb1afe3c8333f698be27000a19814af47