Add additional test cases

Change-Id: I74bb9e79485ab2e2a70d9789c68470fa7cfba95e
Cleanup test objects and ensure that test passes with HEAPCHECK

Change-Id: I3a32bd1483c39dcc76052f027d239435e7e56443