Unit tests

Change-Id: I29731fd7225b2b3bb10fe94a8f97040e3239758b