Unit tests

Change-Id: I613bde86e78929a689a3131fc486ea283add382d