Solved the last fleck of failure in my tests THUNDERCATS HOOOOO