Unit tests

Change-Id: I2fe7b522daaf7fffd15e90cccd234426b249e49e