changes to make sure test can run in parallel