Unit tests

Change-Id: I95abe8ec6fde7104ea53ea406dc7efcc63a39706