Unit tests

Change-Id: I15bd1dbf2b447b44025588e3906a3fcb4e06d3ec