Unit tests

Change-Id: Ief1bc305e2fd330b22266be96d2c200c3b4294e6