Add concept of particle versus field velocity.  Fix up test.