code cleanup on checkAssembledTx
finishes annotation tests