8164887: update tests to remove use of old-style optionsReviewed-by: mchung
8154997: Add examples for jigsaw diagnosticsReviewed-by: jjg, jlahoda