Index: test/exemplars/issue_status_exemplar.rb
===================================================================
--- test/exemplars/issue_status_exemplar.rb	(revision 4803)
+++ test/exemplars/issue_status_exemplar.rb	(working copy)
@@ -1,9 +1,8 @@
 class IssueStatus < ActiveRecord::Base
   generator_for :name, :method => :next_name
 
-  def self.next_name
-    @last_name ||= 'Status 0'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'Status 0'
+    last_name.succ
   end
 end
Index: test/exemplars/document_category_exemplar.rb
===================================================================
--- test/exemplars/document_category_exemplar.rb	(revision 4803)
+++ test/exemplars/document_category_exemplar.rb	(working copy)
@@ -2,9 +2,8 @@
   generator_for :name, :method => :next_name
   generator_for :type => 'DocumentCategory'
 
-  def self.next_name
-    @last_name ||= 'DocumentCategory0'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'DocumentCategory0'
+    last_name.succ
   end
 end
Index: test/exemplars/change_exemplar.rb
===================================================================
--- test/exemplars/change_exemplar.rb	(revision 4803)
+++ test/exemplars/change_exemplar.rb	(working copy)
@@ -3,10 +3,9 @@
   generator_for :path, :method => :next_path
   generator_for :changeset, :method => :generate_changeset
 
-  def self.next_path
-    @last_path ||= 'test/dir/aaa0001'
-    @last_path.succ!
-    @last_path
+  def self.next_path(last_path)
+    last_path ||= 'test/dir/aaa0001'
+    last_path.succ
   end
 
   def self.generate_changeset
Index: test/exemplars/message_exemplar.rb
===================================================================
--- test/exemplars/message_exemplar.rb	(revision 4803)
+++ test/exemplars/message_exemplar.rb	(working copy)
@@ -3,16 +3,14 @@
   generator_for :content, :method => :next_content
   generator_for :board, :method => :generate_board
 
-  def self.next_subject
-    @last_subject ||= 'A Message'
-    @last_subject.succ!
-    @last_subject
+  def self.next_subject(last_subject)
+    last_subject ||= 'A Message'
+    last_subject.succ
   end
 
-  def self.next_content
-    @last_content ||= 'Some content here'
-    @last_content.succ!
-    @last_content
+  def self.next_content(last_content)
+    last_content ||= 'Some content here'
+    last_content.succ
   end
 
   def self.generate_board
Index: test/exemplars/custom_field_exemplar.rb
===================================================================
--- test/exemplars/custom_field_exemplar.rb	(revision 4803)
+++ test/exemplars/custom_field_exemplar.rb	(working copy)
@@ -2,9 +2,8 @@
   generator_for :name, :method => :next_name
   generator_for :field_format => 'string'
 
-  def self.next_name
-    @last_name ||= 'CustomField0'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'CustomField0'
+    last_name.succ
   end
 end
Index: test/exemplars/role_exemplar.rb
===================================================================
--- test/exemplars/role_exemplar.rb	(revision 4803)
+++ test/exemplars/role_exemplar.rb	(working copy)
@@ -1,8 +1,8 @@
 class Role < ActiveRecord::Base
   generator_for :name, :method => :next_name
 
-  def self.next_name
-    @last_name ||= 'Role0'
-    @last_name.succ!
+  def self.next_name(last_name)
+    last_name ||= 'Role0'
+    last_name.succ
   end
 end
Index: test/exemplars/issue_exemplar.rb
===================================================================
--- test/exemplars/issue_exemplar.rb	(revision 4803)
+++ test/exemplars/issue_exemplar.rb	(working copy)
@@ -3,10 +3,9 @@
   generator_for :author, :method => :next_author
   generator_for :priority, :method => :fetch_priority
   
-  def self.next_subject
-    @last_subject ||= 'Subject 0'
-    @last_subject.succ!
-    @last_subject
+  def self.next_subject(last_subject)
+    last_subject ||= 'Subject 0'
+    last_subject.succ
   end
 
   def self.next_author
Index: test/exemplars/project_exemplar.rb
===================================================================
--- test/exemplars/project_exemplar.rb	(revision 4803)
+++ test/exemplars/project_exemplar.rb	(working copy)
@@ -3,18 +3,16 @@
   generator_for :identifier, :method => :next_identifier_from_object_daddy
   generator_for :enabled_modules, :method => :all_modules
   generator_for :trackers, :method => :next_tracker
-  
-  def self.next_name
-    @last_name ||= 'Project 0'
-    @last_name.succ!
-    @last_name
+
+  def self.next_name(last_name)
+    last_name ||= 'Project 0'
+    last_name.succ
   end
 
   # Project#next_identifier is defined on Redmine
-  def self.next_identifier_from_object_daddy
-    @last_identifier ||= 'project-0000'
-    @last_identifier.succ!
-    @last_identifier
+  def self.next_identifier_from_object_daddy(last_identifier)
+    last_identifier ||= 'project-0000'
+    last_identifier.succ
   end
 
   def self.all_modules
Index: test/exemplars/issue_priority_exemplar.rb
===================================================================
--- test/exemplars/issue_priority_exemplar.rb	(revision 4803)
+++ test/exemplars/issue_priority_exemplar.rb	(working copy)
@@ -2,9 +2,8 @@
   generator_for :name, :method => :next_name
   generator_for :type => 'IssuePriority'
 
-  def self.next_name
-    @last_name ||= 'IssuePriority0'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'IssuePriority0'
+    last_name.succ
   end
 end
Index: test/exemplars/document_exemplar.rb
===================================================================
--- test/exemplars/document_exemplar.rb	(revision 4803)
+++ test/exemplars/document_exemplar.rb	(working copy)
@@ -1,9 +1,8 @@
 class Document < ActiveRecord::Base
   generator_for :title, :method => :next_title
 
-  def self.next_title
-    @last_title ||= 'Document001'
-    @last_title.succ!
-    @last_title
+  def self.next_title(last_title)
+    last_title ||= 'Document001'
+    last_title.succ
   end
 end
Index: test/exemplars/repository_exemplar.rb
===================================================================
--- test/exemplars/repository_exemplar.rb	(revision 4803)
+++ test/exemplars/repository_exemplar.rb	(working copy)
@@ -2,10 +2,9 @@
   generator_for :type => 'Subversion'
   generator_for :url, :method => :next_url
 
-  def self.next_url
-    @last_url ||= 'file:///test/svn'
-    @last_url.succ!
-    @last_url
+  def self.next_url(last_url)
+    last_url ||= 'file:///test/svn'
+    last_url.succ
   end
 
 end
Index: test/exemplars/board_exemplar.rb
===================================================================
--- test/exemplars/board_exemplar.rb	(revision 4803)
+++ test/exemplars/board_exemplar.rb	(working copy)
@@ -3,16 +3,14 @@
   generator_for :description, :method => :next_description
   generator_for :project, :method => :generate_project
 
-  def self.next_name
-    @last_name ||= 'A Forum'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'A Forum'
+    last_name.succ
   end
 
-  def self.next_description
-    @last_description ||= 'Some description here'
-    @last_description.succ!
-    @last_description
+  def self.next_description(last_description)
+    last_description ||= 'Some description here'
+    last_description.succ
   end
 
   def self.generate_project
Index: test/exemplars/user_exemplar.rb
===================================================================
--- test/exemplars/user_exemplar.rb	(revision 4803)
+++ test/exemplars/user_exemplar.rb	(working copy)
@@ -3,28 +3,25 @@
   generator_for :mail, :method => :next_email
   generator_for :firstname, :method => :next_firstname
   generator_for :lastname, :method => :next_lastname
-  
-  def self.next_login
-    @gen_login ||= 'user1'
-    @gen_login.succ!
-    @gen_login
+
+  def self.next_login(gen_login)
+    gen_login ||= 'user1'
+    gen_login.succ
   end
-  
+
   def self.next_email
     @last_email ||= 'user1'
     @last_email.succ!
     "#{@last_email}@example.com"
   end
 
-  def self.next_firstname
-    @last_firstname ||= 'Bob'
-    @last_firstname.succ!
-    @last_firstname
+  def self.next_firstname(last_firstname)
+    last_firstname ||= 'Bob'
+    last_firstname.succ
   end
 
-  def self.next_lastname
-    @last_lastname ||= 'Doe'
-    @last_lastname.succ!
-    @last_lastname
+  def self.next_lastname(last_lastname)
+    last_lastname ||= 'Doe'
+    last_lastname.succ
   end
 end
Index: test/exemplars/auth_source_exemplar.rb
===================================================================
--- test/exemplars/auth_source_exemplar.rb	(revision 4803)
+++ test/exemplars/auth_source_exemplar.rb	(working copy)
@@ -1,9 +1,8 @@
 class AuthSource < ActiveRecord::Base
   generator_for :name, :method => :next_name
 
-  def self.next_name
-    @last_name ||= 'Auth0'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'Auth0'
+    last_name.succ
   end
 end
Index: test/exemplars/enabled_module_exemplar.rb
===================================================================
--- test/exemplars/enabled_module_exemplar.rb	(revision 4803)
+++ test/exemplars/enabled_module_exemplar.rb	(working copy)
@@ -1,10 +1,9 @@
 class EnabledModule < ActiveRecord::Base
   generator_for :name, :method => :next_name
 
-  def self.next_name
-    @last_name ||= 'module_001'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'module_001'
+    last_name.succ
   end
 
 end
Index: test/exemplars/tracker_exemplar.rb
===================================================================
--- test/exemplars/tracker_exemplar.rb	(revision 4803)
+++ test/exemplars/tracker_exemplar.rb	(working copy)
@@ -1,9 +1,8 @@
 class Tracker < ActiveRecord::Base
   generator_for :name, :method => :next_name
 
-  def self.next_name
-    @last_name ||= 'Tracker 0'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'Tracker 0'
+    last_name.succ
   end
 end
Index: test/exemplars/enumeration_exemplar.rb
===================================================================
--- test/exemplars/enumeration_exemplar.rb	(revision 4803)
+++ test/exemplars/enumeration_exemplar.rb	(working copy)
@@ -2,9 +2,8 @@
   generator_for :name, :method => :next_name
   generator_for :type => 'TimeEntryActivity'
 
-  def self.next_name
-    @last_name ||= 'Enumeration0'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'Enumeration0'
+    last_name.succ
   end
 end
Index: test/exemplars/group_exemplar.rb
===================================================================
--- test/exemplars/group_exemplar.rb	(revision 4803)
+++ test/exemplars/group_exemplar.rb	(working copy)
@@ -1,10 +1,9 @@
 class Group < Principal
   generator_for :lastname, :method => :next_lastname
 
-  def self.next_lastname
-    @last_lastname ||= 'Group'
-    @last_lastname.succ!
-    @last_lastname
+  def self.next_lastname(last_lastname)
+    last_lastname ||= 'Group'
+    last_lastname.succ
   end
 
 end
Index: test/exemplars/time_entry_activity.rb
===================================================================
--- test/exemplars/time_entry_activity.rb	(revision 4803)
+++ test/exemplars/time_entry_activity.rb	(working copy)
@@ -2,9 +2,8 @@
   generator_for :name, :method => :next_name
   generator_for :type => 'TimeEntryActivity'
 
-  def self.next_name
-    @last_name ||= 'TimeEntryActivity0'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'TimeEntryActivity0'
+    last_name.succ
   end
 end
Index: test/exemplars/wiki_redirect_exemplar.rb
===================================================================
--- test/exemplars/wiki_redirect_exemplar.rb	(revision 4803)
+++ test/exemplars/wiki_redirect_exemplar.rb	(working copy)
@@ -3,16 +3,14 @@
   generator_for :redirects_to, :method => :next_redirects_to
   generator_for :wiki, :method => :generate_wiki
 
-  def self.next_title
-    @last_title ||= 'AWikiPage'
-    @last_title.succ!
-    @last_title
+  def self.next_title(last_title)
+    last_title ||= 'AWikiPage'
+    last_title.succ
   end
 
-  def self.next_redirects_to
-    @last_redirect ||= '/a/path/000001'
-    @last_redirect.succ!
-    @last_redirect
+  def self.next_redirects_to(last_redirect)
+    last_redirect ||= '/a/path/000001'
+    last_redirect.succ
   end
 
   def self.generate_wiki
Index: test/exemplars/query_exemplar.rb
===================================================================
--- test/exemplars/query_exemplar.rb	(revision 4803)
+++ test/exemplars/query_exemplar.rb	(working copy)
@@ -1,9 +1,8 @@
 class Query < ActiveRecord::Base
   generator_for :name, :method => :next_name
 
-  def self.next_name
-    @last_name ||= 'Query 0'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'Query 0'
+    last_name.succ
   end
 end
Index: test/exemplars/subversion_repository_exemplar.rb
===================================================================
--- test/exemplars/subversion_repository_exemplar.rb	(revision 4803)
+++ test/exemplars/subversion_repository_exemplar.rb	(working copy)
@@ -2,10 +2,9 @@
   generator_for :type, :method => 'Subversion'
   generator_for :url, :method => :next_url
 
-  def self.next_url
-    @last_url ||= 'file:///test/svn'
-    @last_url.succ!
-    @last_url
+  def self.next_url(last_url)
+    last_url ||= 'file:///test/svn'
+    last_url.succ
   end
 
 end
Index: test/exemplars/issue_category_exemplar.rb
===================================================================
--- test/exemplars/issue_category_exemplar.rb	(revision 4803)
+++ test/exemplars/issue_category_exemplar.rb	(working copy)
@@ -1,9 +1,8 @@
 class IssueCategory < ActiveRecord::Base
   generator_for :name, :method => :next_name
   
-  def self.next_name
-    @last_name ||= 'Category 0001'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'Category 0001'
+    last_name.succ
   end
 end
Index: test/exemplars/version_exemplar.rb
===================================================================
--- test/exemplars/version_exemplar.rb	(revision 4803)
+++ test/exemplars/version_exemplar.rb	(working copy)
@@ -2,10 +2,9 @@
   generator_for :name, :method => :next_name
   generator_for :status => 'open'
   
-  def self.next_name
-    @last_name ||= 'Version 1.0.0'
-    @last_name.succ!
-    @last_name
+  def self.next_name(last_name)
+    last_name ||= 'Version 1.0.0'
+    last_name.succ
   end
 
 end
Index: test/exemplars/wiki_page_exemplar.rb
===================================================================
--- test/exemplars/wiki_page_exemplar.rb	(revision 4803)
+++ test/exemplars/wiki_page_exemplar.rb	(working copy)
@@ -2,10 +2,9 @@
   generator_for :title, :method => :next_title
   generator_for :wiki, :method => :generate_wiki
 
-  def self.next_title
-    @last_title ||= 'AWikiPage'
-    @last_title.succ!
-    @last_title
+  def self.next_title(last_title)
+    last_title ||= 'AWikiPage'
+    last_title.succ
   end
 
   def self.generate_wiki
Index: test/exemplars/changeset_exemplar.rb
===================================================================
--- test/exemplars/changeset_exemplar.rb	(revision 4803)
+++ test/exemplars/changeset_exemplar.rb	(working copy)
@@ -3,10 +3,9 @@
   generator_for :committed_on => Date.today
   generator_for :repository, :method => :generate_repository
 
-  def self.next_revision
-    @last_revision ||= '1'
-    @last_revision.succ!
-    @last_revision
+  def self.next_revision(last_revision )
+    last_revision  ||= '1'
+    last_revision.succ
   end
 
   def self.generate_repository
Index: test/exemplars/news_exemplar.rb
===================================================================
--- test/exemplars/news_exemplar.rb	(revision 4803)
+++ test/exemplars/news_exemplar.rb	(working copy)
@@ -2,15 +2,13 @@
   generator_for :title, :method => :next_title
   generator_for :description, :method => :next_description
 
-  def self.next_title
-    @last_title ||= 'A New Item'
-    @last_title.succ!
-    @last_title
+  def self.next_title(last_title)
+    last_title ||= 'A New Item'
+    last_title.succ
   end
 
-  def self.next_description
-    @last_description ||= 'Some content here'
-    @last_description.succ!
-    @last_description
+  def self.next_description(last_description)
+    last_description ||= 'Some content here'
+    last_description.succ
   end
 end