Fix intermittent test failure regarding multiple versions