WIP: Fixing intermittent test failures
Remove debug breakpoint