Added more multithreading to tests