Fixed for concurrent running of tests