Unit tests

Change-Id: If7df8c6a72cef2155fe163921314da6cb368349a