Amending test from taxip to work with yield
Fix 2DC bug !