Unit tests

Change-Id: Ie3bab74e194298c9c61c1fd5a70768e6bdbed48a