Unit tests

Change-Id: Id1c9ac16c0d03de81940cfddf9def1f79810d1ed