Unit tests

Change-Id: I9820b3bfaffa65ce7b607db85780df7ca466030f