diff --git a/tests/drawingtests.rb b/tests/drawingtests.rb
index c964ebb..b3b5a8c 100644
--- a/tests/drawingtests.rb
+++ b/tests/drawingtests.rb
@@ -74,7 +74,7 @@ class Test_04_drawings_screen < Test::Unit::TestCase
     @@ie.button(:id, 'upload').click
     @@ie.wait
     assert(@@ie.contains_text('Upload File'),'The file upload screen did not appear')     
-    assert(@@ie.button(:id, 'P41_FILE_UPLOAD').exists?,'The file upload field was not available')
+    assert(@@ie.button(:id, 'upload').exists?,'The file upload button was not available')
     #
     #Upload a file to the drawing and check that we get a success message
     #
diff --git a/tests/moduletests.rb b/tests/moduletests.rb
index 91a47ec..c095df5 100644
--- a/tests/moduletests.rb
+++ b/tests/moduletests.rb
@@ -29,7 +29,7 @@ class Test_08_modules_screen < Test::Unit::TestCase
     @@ie.wait
     assert(@@ie.contains_text('Create/Edit Module'),'The create/edit module screen did not appear')
     assert(@@ie.text_field(:id, 'P57_CODE').exists?,'The module code field is not available')
-    assert(@@ie.text_field(:id, 'P57_METR_CODE').exists?,'The meter code field is not available')
+    assert(@@ie.select_list(:id, 'P57_METR_CODE').exists?,'The meter code field is not available')
     assert(@@ie.select_list(:id, 'P57_FLTR_CODE').exists?,'The filter code field is not available')
     assert(@@ie.select_list(:id, 'P57_REGU_CODE').exists?,'The regulator code field is not available')
     assert(@@ie.select_list(:id, 'P57_REVA_CODE').exists?,'The relief valve field is not available')
@@ -37,8 +37,8 @@ class Test_08_modules_screen < Test::Unit::TestCase
     assert(@@ie.select_list(:id, 'P57_SVCP_CODE').exists?,'The service pressure field is not available')
     assert(@@ie.select_list(:id, 'P57_PRTY_ID').exists?,'The manufacturer field is not available')
     assert(@@ie.select_list(:id, 'P57_DRWG_CODE').exists?,'The drawing code field is not available')
-    assert(@@ie.text_field(:id, 'P57_BAS_CODE').exists?,'The base code field is not available')
-    assert(@@ie.text_field(:id, 'P57_HOU_CODE').exists?,'The housing code field is not available')
+    assert(@@ie.select_list(:id, 'P57_BAS_CODE').exists?,'The base code field is not available')
+    assert(@@ie.select_list(:id, 'P57_HOU_CODE').exists?,'The housing code field is not available')
     assert(@@ie.select_list(:id, 'P57_INLET_CNOR_CODE').exists?,'The inlet connection orientation field is not available')
     assert(@@ie.select_list(:id, 'P57_INLET_CNTY_CODE').exists?,'The inlet connection type is not available')
     assert(@@ie.select_list(:id, 'P57_OUTLET_CNOR_CODE').exists?,'The outlet connection orientation field is not available')
diff --git a/tests/user_management.rb b/tests/user_management.rb
index 164a9a1..488c07a 100644
--- a/tests/user_management.rb
+++ b/tests/user_management.rb
@@ -76,7 +76,7 @@ class Test_09_MIPADMIN_party_management< Test::Unit::TestCase
     assert(@@ie.text_field(:id,'P61_COMMENTS').exists?,'Could not find P61_COMMENTS field')
      assert(@@ie.text_field(:id,'P61_PASSWORD').exists?,'Could not find P61_PASSWORD file upload field')
     assert(@@ie.text_field(:id,'P61_REPEAT_PASSWORD').exists?,'Could not find P61_REPEAT_PASSWORD file upload field')
-    assert(@@ie.radio(:id,'P61_EXPIRE_PWORD').exists?,'Could not find P61_EXPIRE_PWORD radio buttons')
+    assert(@@ie.select_list(:id,'P61_EXPIRE_PWORD').exists?,'Could not find P61_EXPIRE_PWORD select list')
     
     #Test the objects on P62
     @@ie.goto(ASSIGN_PARTY_ROLE)
@@ -608,7 +608,7 @@ class Test_11_edit_parties< Test::Unit::TestCase
 
     @@ie.button(:value,'Add Address').click
     @@ie.wait    
-    assert(@@ie.select_list(:id,'P69_SELECT_ADDRESS').exists?,'Could not find P69_SELECT_ADDRESS select list')
+    assert(@@ie.text_field(:id,'P69_SELECT_ADDRESS').exists?,'Could not find P69_SELECT_ADDRESS select list')
     assert(@@ie.button(:value,'Copy Address').exists?,'Could not find Copy Address button')
     assert(@@ie.text_field(:id,'P69_ADDR_CODE').exists?,'Could not find P69_ADDR_CODE field')
     assert(@@ie.select_list(:id,'P69_ADDR_TYPE').exists?,'Could not find P69_ADDR_TYPE select list')