Unit tests update

Change-Id: I0fdba21cbd5cbf84004138aa17eb10ebb71f0e93