Make integration test service more thread safe