Merge conflict between my pr that added the full test suite and Sun's that fixed one of the tests.
Attach a file by drag & drop or click to upload
