WIP: Fixing intermittent test failures