Unit tests

Change-Id: Ie878975ae18c849bea16432bf7eb02c5f81ea9a7