Unit tests

Change-Id: I5f5ec5fda398c3cb21eb89d78f624f9d3ab93a1d