Trajectory

Restructured the test to take advantage of the ``body()`` function.