Unit tests

Change-Id: I19e98ff771932e29f1a351709c1e6a4001f1e2fd