diff --git a/check.py b/check.py
index 6bd77f3f..ab580502 100755
--- a/check.py
+++ b/check.py
@@ -9,9 +9,6 @@ except:
 
 class XAvp:
   """ Class to simulate the xavp """
-  _data = []
-  _name = ""
-
   def __init__(self, name, data):
     result = re.match('\$xavp\((\w+)\)', name)
     try:
@@ -70,8 +67,9 @@ class XAvp:
 
 class Test:
   """ Class to create TAP output """
-  _step = []
-  _errflag = False
+  def __init__(self):
+    self._step = []
+    self._errflag = False
 
   def comment(self, msg):
     """ Add a comment """
@@ -122,11 +120,23 @@ class Test:
       test = test + 1
     return output
 
-def check_flow_vars(sk, sv, ck, cv, test):
+def check_flow_vars(sk, sv, cv, test):
   """ check the vars on a flow level"""
   for k in sv.iterkeys():
     if(not cv.has_key(k)):
-      test.error('Expected var %d on flow[%s]' % (k,sk))
+      try:
+        info = XAvp.parse(k)
+        search_key = '$xavp(%s)' % info['name']
+        if(not cv.has_key(search_key)):
+          raise Exception("search_key: %s info:%s" % (search_key, info))
+        xavp = XAvp(search_key, cv[search_key])
+        val = xavp.get(k)
+        #print "testing %s == %s" % (sv[k], val)
+        test.test(sv[k], val, 'flow[%s] expected %s == %s but is %s' % (sk, k, sv[k], val), 'flow[%s] %s' % (sk, k))
+      except LookupError as err:
+        test.error('LookupError with %s. Error:%s' % (k, err))
+      except Exception as err:
+        test.error('Expected var %s on flow[%s]' % (k,sk))
     else:
       test.test(sv[k], cv[k], 'flow[%s] expected %s == %s but is %s' % (sk, k, sv[k], cv[k]), 'flow[%s] %s' % (sk, k))
 
@@ -147,7 +157,7 @@ def check_flow(scen, check, test):
       continue
     else:
       test.ok('flow[%s]' % sk)
-    check_flow_vars(sk, sv, ck, cv, test)
+    check_flow_vars(sk, sv, cv, test)
   if(len(check)>len(scen)):
     l = []
     for i in check:
diff --git a/test_check.py b/test_check.py
index 12a002ec..a531013b 100644
--- a/test_check.py
+++ b/test_check.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from check import XAvp
+from check import XAvp, Test, check_flow, check_flow_vars
 import unittest
 
 class TestXAvp(unittest.TestCase):
@@ -49,6 +49,7 @@ class TestXAvp(unittest.TestCase):
 class TestCheckFlowVars(unittest.TestCase):
 
   def setUp(self):
+    self.ctest = Test()
     self.check_ok = [
       { 'R0': { '$xavp(v0)':
                  [{
@@ -65,9 +66,13 @@ class TestCheckFlowVars(unittest.TestCase):
       },
       { 'R1': { '$xavp(v0)': [{'k0': [1,2]}] }},
     ]
-    self.scen = [
+    self.scen_noxavp = [
       { 'R0': {'fU': 'testpep'} },
-      { 'R1': {'$xavp(v0[0]=>k0[0]': 1} },
+      { 'R1': {} },
+    ]
+    self.scen = [
+      { 'R0': {'$xavp(v0[0]=>k0[0])': 1, '$xavp(v0[0]=>k1[0])': 'a'} },
+      { 'R1': {'$xavp(v0[1]=>k0[0])': 1} },
     ]
 
   def testXAvp(self):
@@ -79,8 +84,19 @@ class TestCheckFlowVars(unittest.TestCase):
     self.assertEqual(xavp.get('$xavp(v0[1]=>k0[1])'), 2)
     self.assertEqual(xavp.get('$xavp(v0[1]=>k1[*])'), ['a'])
 
-  def testFlow(self):
-    pass
+  def testFlow_noxavp(self):
+    check_flow(self.scen_noxavp, self.check_ok, self.ctest)
+    self.assertFalse(self.ctest.isError())
+
+  def testFlowVars_noxavp(self):
+    check_flow_vars('RO', self.scen_noxavp[0]['R0'], self.check_ok[0]['R0'], self.ctest)
+    print self.ctest
+    self.assertFalse(self.ctest.isError())
+
+  def testFlowVars_xavp(self):
+    check_flow_vars('RO', self.scen[0]['R0'], self.check_ok[0]['R0'], self.ctest)
+    print self.ctest
+    self.assertFalse(self.ctest.isError())
 
 if __name__ == '__main__':
     unittest.main()
\ No newline at end of file