Unit tests

Change-Id: I88388f1449c92897a3f2fea11a2fa6bd42917647