Unit tests

Change-Id: I91e4f89e5b02f86e9d8073dd342e83e8f084246e