Minor test improvement for #646