Fixed bug in getTwinOrientation()
Fixed dangling pointers in clearSubShapes()
Fixed merge error
Updated naming test parts to Body architecture