Unit tests

Change-Id: I27fc86cd1d42008064e375562d0fdda23d93107c