Unit tests

Change-Id: I03892d4f3afc50288ba66b4a28d3f54d7a05f81c