Trying to avoid concurrency in order to make the tests pass