Unit tests

Change-Id: Ia5602222b5fb2f056c77f52c184ba36a7ab3c89f