DDF-333: Removed randomized endpoints in exchange for incrementer