Unit tests

Change-Id: Idcceb47ed94f14cfcf9b9808db30487b689a02dc