Unit tests

Change-Id: I1e2f8aca4c5d9d1a7ef0cd6cbc6f525d425537e0