diff --git a/tests/user_management.rb b/tests/user_management.rb
index 8b93273..91738ab 100644
--- a/tests/user_management.rb
+++ b/tests/user_management.rb
@@ -570,7 +570,7 @@ class Test_11_edit_parties< Test::Unit::TestCase
     @@ie.wait    
     #check market participant fields
     @@ie.select_list(:id,'P65_PRTY_TYPE').set('Market Participant')
-    @@ie.link(:name,/Edit Supplier1 SU1/).click
+    @@ie.link(:name,'Edit Supplier_SU1').click
     @@ie.wait    
     assert(@@ie.button(:value,'Cancel').exists?,'Could not find Cancel button(mktp fields)')
     assert(@@ie.button(:value,'Delete').exists?,'Could not find Delete button')
@@ -591,7 +591,7 @@ class Test_11_edit_parties< Test::Unit::TestCase
     @@ie.wait
     #check manufacturer fields
     @@ie.select_list(:id,'P65_PRTY_TYPE').set('Manufacturer')
-    @@ie.link(:name,'Edit Manufacturer1 ').click
+    @@ie.link(:name,'Edit Manufacturer1_').click
     @@ie.wait    
     assert(@@ie.button(:value,'Cancel').exists?,'Could not find Cancel button(manu fields)')
     assert(@@ie.button(:value,'Apply Changes').exists?,'Could not find Apply Changes button')
@@ -639,9 +639,9 @@ class Test_11_edit_parties< Test::Unit::TestCase
     #edit a different user
     #@@ie.goto(EDIT_PARTIES)
     @@ie.select_list(:id,'P65_PRTY_TYPE').set('User')
-    @@ie.link(:text,/Next/).click
-    @@ie.wait
-    @@ie.link(:name,'Edit SuppAgent1 ').click
+    #@@ie.link(:text,/Next/).click
+    #@@ie.wait
+    @@ie.link(:name,'Edit SuppAgent1_').click
     @@ie.wait    
     @@ie.text_field(:id,'P66_TELEPHONE').set('01234 567899')
     @@ie.button(:value,'Apply Changes').click
@@ -682,7 +682,7 @@ class Test_11_edit_parties< Test::Unit::TestCase
     @@ie.wait    
     assert(@@ie.contains_text('Action Processed.'),'Party not updated correctly')
     
-    @@ie.link(:name,/Edit SuppAgent1/).click
+    @@ie.link(:name,'Edit SuppAgent1_').click
     @@ie.wait
     @@ie.text_field(:id,'P66_TELEPHONE').set('01234 567809')
     @@ie.button(:value,'Apply Changes').click
@@ -702,7 +702,7 @@ class Test_11_edit_parties< Test::Unit::TestCase
   
     #edit a supplier, the one created above for ease...
     @@ie.select_list(:id,'P65_PRTY_TYPE').set('Market Participant')
-    @@ie.link(:name,'Edit Supplier1 SU1').click
+    @@ie.link(:name,'Edit Supplier1_SU1').click
     #add an address
     @@ie.button(:value,'Add Address').click
     @@ie.text_field(:id,'P69_ADDR_CODE').set('SU1_OFFICE2')