diff -r cc27136cdead -r fdaa7dc9035e tests/test_configparser.py
--- a/tests/test_configparser.py	Sat Apr 06 00:07:17 2013 +0200
+++ b/tests/test_configparser.py	Sat Apr 13 14:11:26 2013 +0200
@@ -10,17 +10,17 @@
 
     def setUp(self):
         self.config = ConfigParser()
-        self.config.add_argument('arg_str')
-        self.config.add_argument('arg_int', int, 1)
+        self.config.add_option('arg_str')
+        self.config.add_option('arg_int', int, 1)
         script_path = os.path.dirname(os.path.realpath(__file__))
         self.data_path = os.path.join(script_path, 'data')
 
-    def test_add_argument(self):
+    def test_add_option(self):
         name = 'argname'
-        self.config.add_argument(name, int, 1)
-        self.assertEqual(self.config.registered_args[name]['type'], int)
-        self.assertEqual(self.config.registered_args[name]['default'], 1)
-        self.assertEqual(self.config.args[name], 1)
+        self.config.add_option(name, int, 1)
+        self.assertEqual(self.config.options[name]['type'], int)
+        self.assertEqual(self.config.options[name]['default'], 1)
+        self.assertEqual(self.config.values[name], 1)
 
     def test_load_badname(self):
         self.assertRaises(IOError, self.config.load, 'bad/file_name')