Index: /main/waeup.uniben/trunk/src/waeup/uniben/applicants/tests/test_browser.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/applicants/tests/test_browser.py	(revision 18099)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/applicants/tests/test_browser.py	(revision 18100)
@@ -46,4 +46,15 @@
     #    return
 
+    def fill_correct_values(self):
+        # Fill the edit form with suitable values
+        self.browser.getControl(name="form.firstname").value = 'John'
+        self.browser.getControl(name="form.middlename").value = 'Anthony'
+        self.browser.getControl(name="form.lastname").value = 'Tester'
+        self.browser.getControl(name="form.course1").value = ['CERT1']
+        self.browser.getControl(name="form.date_of_birth").value = '09/09/1988'
+        self.browser.getControl(name="form.sex").value = ['m']
+        self.browser.getControl(name="form.email").value = 'xx@yy.zz'
+        self.browser.getControl(name="form.phone.ext").value = '12345'
+
     def test_applicant_access(self):
         # Anonymous users can't see the application fee.
@@ -266,4 +277,5 @@
         self.browser.getControl(name="form.sex").value = ['m']
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'
+        self.browser.getControl(name="form.phone.ext").value = '12345'
         image = open(SAMPLE_IMAGE, 'rb')
         ctrl = self.browser.getControl(name='form.passport')
Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py	(revision 18099)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py	(revision 18100)
@@ -905,17 +905,15 @@
         self.browser.getLink("here").click()
         self.browser.getControl(name="form.course").value = ['COURSE1']
-        # Non-final year students can't add ticket with 51 credits
-        self.app['faculties']['fac1']['dep1'].courses['COURSE1'].credits = 51
+        # Non-final year students can't add ticket with 52 credits
+        self.app['faculties']['fac1']['dep1'].courses['COURSE1'].credits = 52
         self.browser.getControl("Add course ticket").click()
-        self.assertMatches('...Maximum credits exceeded...',
-                           self.browser.contents)
-        # Final year students can't add ticket with 52 credits ...
-        self.app['faculties']['fac1']['dep1'].courses['COURSE1'].credits = 52
+        self.assertTrue('Maximum credits exceeded' in self.browser.contents)
+        # Final year students can't add ticket with 54 credits ...
+        self.app['faculties']['fac1']['dep1'].courses['COURSE1'].credits = 54
         self.student['studycourse'].certificate.end_level = 700
         self.browser.getControl("Add course ticket").click()
-        self.assertMatches('...Maximum credits exceeded...',
-                           self.browser.contents)
-        # ... but with 51 credits
-        self.app['faculties']['fac1']['dep1'].courses['COURSE1'].credits = 51
+        self.assertTrue('Maximum credits exceeded.' in self.browser.contents)
+        # ... but with 53 credits
+        self.app['faculties']['fac1']['dep1'].courses['COURSE1'].credits = 53
         self.browser.getControl("Add course ticket").click()
         self.assertMatches('...Successfully added COURSE1...',
