Unit tests

Change-Id: Id4c2fbbd831f92df1c70df44d1c6116544d80f6f