Re-arranged fixme comments
Moved TGro and intGai to PartialTestCell