1. added testTransform 2. replaced testShape with testMergeShapes Change-Id: I1f7b25a1d2f62ac682f7a19e75fc3a44db7c52f0