Unit tests

Change-Id: Ifae7032ea5f62e96320a764e635ebd7250b44124