CODE: multithreading by JaD
CODE: integration test fix