Added unit tests

Change-Id: Iee51d1e58580ecbc7b3be98a4d6b3a1df2a322bd