Unit tests

Change-Id: Ieb4d712c1a51d0b56d6190dd7644a1a9487af58a