Fix memory leak of Test objects. am: ee59d49576
am: 70f7e21c62

Change-Id: Ic369a976eff83f6a3d5334245741d1ea76950cce