Tester - Fixed bugs with threading