Simplify live tests by removing Thread