Unit tests

Change-Id: I218125c5b86fc5bc01f0268fcbae151a2d7b1807