Unit tests

Change-Id: If71842120d6b96ac9f42b141fc5e680024e1b623