Fix multi-threaded testing
Fix multi-threaded testing


Former-commit-id: 08de9015defe8335e7de7d044a6ef6f0e5e0bf93
jrper/fluidity,jjo31/ATHAM-Fluidity,jrper/fluidity,jrper/fluidity,iakovos-panourgias/fluidity,iakovos-panourgias/fluidity,jjo31/ATHAM-Fluidity,jjo31/ATHAM-Fluidity,jjo31/ATHAM-Fluidity,jjo31/ATHAM-Fluidity,jrper/fluidity,iakovos-panourgias/fluidity,iakovos-panourgias/fluidity,jrper/fluidity,iakovos-panourgias/fluidity