Unit tests

Change-Id: I6e9edc6283672c5b8d73d65572fe1e6316a6d0bd