Removed shape include from tester.
Wrote a CurrentPointSetter class.