Unit tests

Change-Id: I9915351e4b38ce517f28aadf9cbae7c09418a60d