"A more modern definition: "The world line of a freely falling test body is independent of its composition or structure""
*This* definition is perfectly good for test bodies, as it says, with the ordinary concept of test particles as non-perturbing of the background. *This* definition would need many changes and much unnecessary additional complexity to deal with arbitrarily massive bodies (let alone bodies of large extent). This definition, with its limited applicability (but still true for any number of orders of magnitude below a size related to your desired precision, and any composition or structure) is still sufficient to specify how gravity couples to matter - which is all it needs to accomplish. Note, that with limitation to test bodies, as ordinarily understood, this definition applies to arbitrarily complex source configuration and motion of sources - which is nice.
Let's look at how this definition would complexify if you want it to accommodate arbitrary test bodies. First, if you try:
"The world line of a freely falling test body is independent of its composition or structure, or mass"
It is trivially false, as I have demonstrated. The evolution of the system as a whole would change for massive test bodies. Trying to extend by introducing a center of mass, in the GR context, runs into the issue that COM is a difficult issue in GR. Much more seriously, if the background consists of multiple sources, some closer to the massive test body, you get different evolutions that are impossible to compare in any simple way. There is no way to give meaning to 'independent of mass' for such a system for arbitary mass test bodies.
A better approach would be to try:
"The world line of a freely falling test body of given mass is independent of its composition or structure"
This works well for arbitrarily massive 'pointlike' masses. However, it fails (as Physicsmonkey has shown in detail) for extended objects. So now you could try something like:
"The world line of a freely falling test body of given mass is independent of its composition or structure, as long the body deos not span significant curvature over the potion of world line of interest; and we use the COM of the body do define its world line." (Of course, we must define spanning curvature. For example: the Fermi-Normal coordinates extended from the COM world line are arbitrarily close to the Minkowski metric over the extent of the body's world tube, for any small time period along the world COM world line).
The curvature constraint serves to remove the difficulty of defining COM in GR, as well as allowing one to speak of world line of an extended body.
So if we accept 'test bodies' we can keep a simple, useful, practical principal, strictly true only in the limit. If we refuse to limit it to test bodies we are forced to ever more cumbersome definitions.