Unit tests

Change-Id: Id7625e18b53d17cc57e63bf31f4b241f35fb4a65