Added some additional unit tests

Change-Id: I99284ebedf3052316dfebe397eae631dd484e954