Unit tests

Change-Id: I4812674ea8323b1a0c8f25c06bdeefe797ffa353