Unit tests

Change-Id: I6fe3c37eb588b748dcbcff167e38fa343acec952