Unit tests

Change-Id: I4547731ce9b70242909a9eb6237ba28a511f6070