@@ -85,7 +85,13 @@ private function removeAssignedEntities()
         foreach ($humanTasks as $humanTask) {
             $tasks = $this->definitions->getElementsByTagName($humanTask);
             foreach ($tasks as $task) {
-                $task->removeAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'assignment');
+
+                $assignment = $task->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'assignment');
+                // Only remove user/group assignments
+                if (in_array($assignment, ['user', 'group', 'user_group'])) {
+                    $task->removeAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'assignment');
+                }
+
                 $task->removeAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'assignedUsers');
                 $task->removeAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'assignedGroups');
             }
 
@@ -298,6 +298,13 @@ private function parseAssignableTasks()
         foreach ($humanTasks as $humanTask) {
             $tasks = $this->definitions->getElementsByTagName($humanTask);
             foreach ($tasks as $task) {
+
+                $assignment = $task->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'assignment');
+                // If an assignment rule is already set, do not ask to set it
+                if ($assignment) {
+                    continue;
+                }
+
                 $this->assignable->push((object)[
                     'type' => 'task',
                     'id' => $task->getAttribute('id'),
 
@@ -29,11 +29,11 @@ return [
       <bpmn:outgoing>node_12</bpmn:outgoing>
       <bpmn:outgoing>node_13</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:task id="node_5" name="Fill Request" pm:screenRef="request">
+    <bpmn:task id="node_5" name="Fill Request" pm:screenRef="request" pm:assignment="user" pm:assignedUsers="55">
       <bpmn:incoming>node_12</bpmn:incoming>
       <bpmn:outgoing>node_16</bpmn:outgoing>
     </bpmn:task>
-    <bpmn:task id="node_6" name="Approval" pm:screenRef="approve">
+    <bpmn:task id="node_6" name="Approval" pm:screenRef="approve" pm:assignment="self_service" pm:assignedUsers="" pm:assignedGroups="5">
       <bpmn:incoming>node_16</bpmn:incoming>
       <bpmn:outgoing>node_17</bpmn:outgoing>
     </bpmn:task>
 
@@ -135,12 +135,6 @@ private function checkScriptRefs()
      */
     public function testExportImportProcess()
     {
-
-        
-        $this->markTestSkipped();
-
-
-
         // Create an admin user
         $adminUser = factory(User::class)->create([
             'username' => 'admin',
@@ -193,7 +187,7 @@ public function testExportImportProcess()
         // Test to ensure we can download the exported file
         $response = $this->webCall('GET', $response->json('url'));
         $response->assertStatus(200);
-        $response->assertHeader('content-disposition', 'attachment; filename=leave_absence_request.json');
+        $response->assertHeader('content-disposition', 'attachment; filename="Leave Absence Request.json"');
 
         // Get our file contents (we have to do it this way because of
         // Symfony's weird response API)
@@ -235,6 +229,16 @@ public function testExportImportProcess()
 
         $this->assertCount(2, $screen->category->refresh()->screens);
         $this->assertCount(2, $secondScreenCategory->refresh()->screens);
+
+        // Assert that assignments are preserved, except for user and group assignments
+        $process = Process::where('name', 'Leave Absence Request 2')->first();
+        $definitions = $process->getDefinitions();
+        $ns = WorkflowServiceProvider::PROCESS_MAKER_NS;
+        $this->assertEquals("", $definitions->findElementById('node_5')->getAttributeNS($ns, 'assignment'));
+        $this->assertEquals("", $definitions->findElementById('node_5')->getAttributeNS($ns, 'assignedUsers'));
+        
+        $this->assertEquals("self_service", $definitions->findElementById('node_6')->getAttributeNS($ns, 'assignment'));
+        $this->assertEquals("", $definitions->findElementById('node_6')->getAttributeNS($ns, 'assignedGroups'));
     }
 
     /**