Index: branches/features/taskProcedureRework/grails-app/services/CreateDataService.groovy
===================================================================
--- branches/features/taskProcedureRework/grails-app/services/CreateDataService.groovy	(revision 776)
+++ branches/features/taskProcedureRework/grails-app/services/CreateDataService.groovy	(revision 781)
@@ -3,7 +3,8 @@
 /**
 * Provides a data service to create base and demo data.
-* Beware that most, if not all, base data is referenced by "Id" throughout the program.
+* Beware that most, if not all, BASE data is referenced by "Id" throughout the program.
 * This allows changing the text of the 'name' property to something of the same meaning.
 * But be sure to maintain the correct Id during creation, indicated by #1, #2 etc.
+* Task.list()[0] is used to allow integration testing with DEMO data, where Id's may change due to create-delete.
 */
 class  CreateDataService {
@@ -1100,5 +1101,5 @@
         def person = Person.get(3)
 
-        taskInstance = Task.get(5)
+        taskInstance = Task.list()[4]
         taskProcedureInstance = new TaskProcedure(linkedTask: taskInstance,
                                                                                     createdBy: person,
@@ -1107,5 +1108,5 @@
         taskProcedureInstance.addToTasks(taskInstance)
 
-        taskInstance = Task.get(7)
+        taskInstance = Task.list()[6]
         taskProcedureInstance = new TaskProcedure(linkedTask: taskInstance,
                                                                                     createdBy: person,