Unit tests

Change-Id: Ie4b8512c2df76c6a47a4948fd9fede97eed86f87