Fixing for parallel tests