Re: #1589 - added limits to mock dataset - code tidy