Unit tests

Change-Id: I04f1e05de223262fc4904abf38df133bc334ace7