Unit tests

Change-Id: Ia656b43bf9a22c00497d66b28afae293ba2302b8