Fix for parallel test run