Unit tests

Change-Id: I8824b6135d74b0a091d057faecd6d7f6726143e7