Unit tests

Change-Id: I7848e1202222509598cdfe96adc59c223eccc967