Remove a race condition in the tests due to closure issues