Unit tests

Change-Id: I3cdbf9652ae4cb66aefa6564abead9a6908b6218