Unit tests

Change-Id: I03eae2a33e64b8f4a112259bb9ebb2d564a5e66e