Minor revisions to test code and Space2D.