* Added more unit tests to increase test coverage Change-Id: I292ddcd1c98ae49b37032a7d6111e063be397de3