Added test contributed by Jeff Whitaker.