another attempt to resolve timing issues in tests