Unit tests

Change-Id: I78dd17153069fb80f086cf260d74c5951f59eb98