#7854545. Changed helper Data. Added comment Test.