Multithreading unit test
Multithreading fix proposal