@@ -3,42 +3,30 @@ Resource         resource.txt
 
 *** Test Cases ***
 Base Exception
-    [Documentation]  FAIL My message
+    [Documentation]    FAIL My message
     Base Exception
 
 Exception Without Message
-    [Documentation]  FAIL Exception
+    [Documentation]    FAIL Exception
     Exception Without Message
 
-Assertion Error
-    [Documentation]  FAIL Failure message
+AssertionError
+    [Documentation]    FAIL Failure message
     Assertion Error
 
-Runtime Error
-    [Documentation]  FAIL Error message
+RuntimeError
+    [Documentation]    FAIL Error message
     Runtime Error
 
-Name Error
-    [Documentation]  FAIL REGEXP: (NameError: |undefined local variable ).*
-    Name Error
-
-Attribute Error
-    [Documentation]  FAIL REGEXP: (AttributeError: |undefined method).*
-    Attribute Error
-
-Index Error
-    [Documentation]  FAIL REGEXP: (IndexError: ).*
-    Index Error
-
 Zero Division
-    [Documentation]  FAIL REGEXP: (ZeroDivisionError: ).*|divided by 0
+    [Documentation]    FAIL STARTS: ZeroDivisionError:
     Zero Division
 
 Custom Exception
-    [Documentation]  FAIL REGEXP: (MyException: |)My message
+    [Documentation]    FAIL MyException: My message
     Custom Exception
 
 Failure Deeper
-    [Documentation]  FAIL Finally failing
+    [Documentation]    FAIL Finally failing
     Failure Deeper
 
@@ -1,15 +1,7 @@
-import sys
-
-
-class RemoteTestLibrary:
-
+class AcceptanceTestLibrary:
     _unicode = (u'Hyv\u00E4\u00E4 y\u00F6t\u00E4. '
                 u'\u0421\u043F\u0430\u0441\u0438\u0431\u043E!')
 
-    def get_server_language(self):
-        lang = sys.platform.startswith('java') and 'jython' or 'python'
-        return '%s%d%d' % (lang, sys.version_info[0], sys.version_info[1])
-
     # Basic communication (and documenting keywords)
 
     def passing(self):
@@ -79,15 +71,6 @@ def assertion_error(self):
     def runtime_error(self):
         raise RuntimeError('Error message')
 
-    def name_error(self):
-        non_existing
-
-    def attribute_error(self):
-        self.non_existing
-
-    def index_error(self):
-        [][0]
-
     def zero_division(self):
         1/0
 
@@ -176,7 +159,7 @@ def list_containing_objects_as_argument(self, arg):
         self._should_be_equal(arg, ['<MyObject1>', '<MyObject2>'])
 
     def nested_list_as_argument(self, arg):
-        exp = [ [True, False], [[1, '', '<MyObject>', {}]] ]
+        exp = [[True, False], [[1, '', '<MyObject>', {}]]]
         self._should_be_equal(arg, exp)
 
     def dictionary_as_argument(self, arg):
@@ -195,8 +178,8 @@ def dictionary_containing_objects_as_argument(self, arg):
         self._should_be_equal(arg, {'As value': '<MyObject1>', '<MyObject2>': 'As key'})
 
     def nested_dictionary_as_argument(self, arg):
-        exp = { '1': {'': False},
-                '2': {'A': {'n': ''}, 'B': {'o': '<MyObject>', 'e': {}}} }
+        exp = {'1': {'': False},
+                '2': {'A': {'n': ''}, 'B': {'o': '<MyObject>', 'e': {}}}}
         self._should_be_equal(arg, exp)
 
     def _should_be_equal(self, arg, exp):
@@ -257,7 +240,7 @@ def return_list_containing_objects(self):
         return [MyObject(1), MyObject(2)]
 
     def return_nested_list(self):
-        return [ [True, False], [[1, None, MyObject(), {}]] ]
+        return [[True, False], [[1, None, MyObject(), {}]]]
 
     def return_tuple(self):
         return (1, 'two', True)
@@ -266,7 +249,7 @@ def return_empty_tuple(self):
         return ()
 
     def return_nested_tuple(self):
-        return ( (True, False), [(1, None, MyObject(), {})] )
+        return ((True, False), [(1, None, MyObject(), {})])
 
     def return_dictionary(self):
         return {'one': 1, 'spam': 'eggs'}
@@ -284,8 +267,8 @@ def return_dictionary_containing_objects(self):
         return {'As value': MyObject(1), MyObject(2): 'As key'}
 
     def return_nested_dictionary(self):
-        return { 1: {None: False},
-                 2: {'A': {'n': None}, 'B': {'o': MyObject(), 'e': {}}} }
+        return {1: {None: False},
+                2: {'A': {'n': None}, 'B': {'o': MyObject(), 'e': {}}}}
 
     # Not keywords
 
@@ -312,4 +295,4 @@ class MyException(Exception):
     import sys
     from robotremoteserver import RobotRemoteServer
 
-    RobotRemoteServer(RemoteTestLibrary(), *sys.argv[1:])
+    RobotRemoteServer(AcceptanceTestLibrary(), *sys.argv[1:])