Unit tests

Change-Id: I646a955fb1c674d307898eb79f77f368ed4c6b7f