Unit tests

Change-Id: I411a5e79d9b1c328709937fded098b5b7f621a3a