Reviewed-by: alanb, egahlin
Improve reliability by converting the test to Java Reviewed-by: dsamersoff, dholmes