Unit tests

Change-Id: I075aa15d6a3326cc33d59d57e9cb12da25e61a1e