Unit tests

Change-Id: Ia19a105f4bbf3393b95dc99bc777303aaa3afa80