Unit tests

Change-Id: I0595fd77e31a3ee37a0c3c2c0f2cc14d57ead0c4