Unit tests

Change-Id: Ie04b89b397d999bebb72e56ff148596ba804f922