Working on unit tests

Change-Id: Ieea72384d3967a05f2aa283298c26c2a97c56fed