Unit tests

Change-Id: I8fdc8658dae3b0c810a684341ceadd6f7ca02081