Unit tests

Change-Id: I5b3a5e19d024bdb28c38029448dec243477fd2f8