Unit tests

Change-Id: I44bd418b5e82c4ee9778f90660fe5c87bad31967