Unit tests

Change-Id: I95b82f9fe3f33f04c5774d3f1f945d1b940ff49e