--- a/tests/model_validate.py	Fri Mar 02 03:25:21 2012 +0100
+++ b/tests/model_validate.py	Fri Mar 02 13:46:13 2012 +0100
@@ -34,18 +34,16 @@
     def testRoute(self):
         with self.session() as session:
             session.add(Offer(name="t",provider="p",typ="type"))
-        vR = vRoute('type')
-        self.assertEqual(vR("t",None),"t")
-        self.assertEqual(vR(["t","t"],None),["t"])
-        e = self.assertRaises(ValidateException,vR, "s", None)
+        self.assertEqual(vRoute("t",None,typ="type"),"t")
+        self.assertEqual(vRoute(["t","t"],None,typ="type"),["t"])
+        e = self.assertRaises(ValidateException,vRoute, "s", None, typ="type")
         self.assertEqual(str(e),'700:Route s is not valid.')
 
     def testRouteAllow(self):
         with self.session() as session:
             session.add(Offer(name="t",provider="p",typ="type"))
-        vR = vRoute('type')
-        e = self.assertRaises(ValidateException,vR, "t", "foo", allowString=False)
+        e = self.assertRaises(ValidateException,vRoute, "t", "foo", typ="type", allowString=False)
         self.assertEqual(str(e),'700:foo must be a list of routes.')
-        e = self.assertRaises(ValidateException,vR, ["t"], "foo", allowList=False)
+        e = self.assertRaises(ValidateException,vRoute, ["t"], "foo", typ="type", allowList=False)
         self.assertEqual(str(e),'700:foo must be a route - No list of routes.')