Added some untangle and repaired some tests