Removed threading from the tests