Unit tests

Change-Id: Iad419bd84b5436da6881ed99d62f2107802cdd93