Unit tests

Change-Id: I0c3bca8f12b9ecd968eeb48d09d7374be206f2f7