Unit tests

Change-Id: Iae9f67c98205f65dad9b36cc23b8b51b80234380