Test fix for r196394