Make tests a little more concurrency friendly