adding unit tests in progress

Change-Id: I87369beec4dd019cc39e5d70bb32925a042b8a2d