Minor test improvement (wrt #479)