Unit tests

Change-Id: I8dc94ec6b069c88827cca0bb874744783c176092