jdk

f12829f2 - Stuart's review - update the close() and end() expectations