Unit tests

Change-Id: I3bf1f0ed4678d1a4ea9b869cc9b0739968ee30f5