Unit tests

Change-Id: I325de93453d6a4683e3b90cfd6b873fe409aa6fc