Unit tests

Change-Id: If9a4a739581270541fb0e0433a3734671b3ad5b6