Added tests for CurrentPointSetter.
Demarked lines for Shape headers.