Update TriG tests to ensure they run properly and set status to Proposed.
authorGregg Kellogg <gregg@kellogg-assoc.com>
Thu, 13 Jun 2013 16:38:07 -0700
changeset 840 fb8950afeb1f
parent 839 f9d2be0acb35
child 841 8ecea2fa54f6
Update TriG tests to ensure they run properly and set status to Proposed.
trig/tests/HYPHEN_MINUS_in_localName.nq
trig/tests/HYPHEN_MINUS_in_localName.trig
trig/tests/IRIREF_datatype.nq
trig/tests/IRIREF_datatype.trig
trig/tests/IRI_spo.nq
trig/tests/IRI_subject.trig
trig/tests/IRI_with_all_punctuation.nq
trig/tests/IRI_with_all_punctuation.trig
trig/tests/IRI_with_eight_digit_numeric_escape.trig
trig/tests/IRI_with_four_digit_numeric_escape.trig
trig/tests/LITERAL1.nq
trig/tests/LITERAL1.trig
trig/tests/LITERAL1_all_controls.nq
trig/tests/LITERAL1_all_controls.trig
trig/tests/LITERAL1_all_punctuation.nq
trig/tests/LITERAL1_all_punctuation.trig
trig/tests/LITERAL1_ascii_boundaries.nq
trig/tests/LITERAL1_ascii_boundaries.trig
trig/tests/LITERAL2.trig
trig/tests/LITERAL2_ascii_boundaries.nq
trig/tests/LITERAL2_ascii_boundaries.trig
trig/tests/LITERAL_LONG1.trig
trig/tests/LITERAL_LONG1_ascii_boundaries.nq
trig/tests/LITERAL_LONG1_ascii_boundaries.trig
trig/tests/LITERAL_LONG1_with_1_squote.nq
trig/tests/LITERAL_LONG1_with_1_squote.trig
trig/tests/LITERAL_LONG1_with_2_squotes.nq
trig/tests/LITERAL_LONG1_with_2_squotes.trig
trig/tests/LITERAL_LONG2.trig
trig/tests/LITERAL_LONG2_ascii_boundaries.nq
trig/tests/LITERAL_LONG2_ascii_boundaries.trig
trig/tests/LITERAL_LONG2_with_1_squote.nq
trig/tests/LITERAL_LONG2_with_1_squote.trig
trig/tests/LITERAL_LONG2_with_2_squotes.nq
trig/tests/LITERAL_LONG2_with_2_squotes.trig
trig/tests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nq
trig/tests/LITERAL_LONG2_with_REVERSE_SOLIDUS.trig
trig/tests/README
trig/tests/SPARQL_style_base.trig
trig/tests/SPARQL_style_prefix.trig
trig/tests/anonymous_blank_node_graph.trig
trig/tests/anonymous_blank_node_object.nq
trig/tests/anonymous_blank_node_object.trig
trig/tests/anonymous_blank_node_subject.nq
trig/tests/anonymous_blank_node_subject.trig
trig/tests/bareword_a_predicate.nq
trig/tests/bareword_a_predicate.trig
trig/tests/bareword_decimal.nq
trig/tests/bareword_decimal.trig
trig/tests/bareword_double.nq
trig/tests/bareword_double.trig
trig/tests/bareword_integer.trig
trig/tests/blankNodePropertyList_as_object.nq
trig/tests/blankNodePropertyList_as_object.trig
trig/tests/blankNodePropertyList_as_subject.nq
trig/tests/blankNodePropertyList_as_subject.trig
trig/tests/blankNodePropertyList_containing_collection.nq
trig/tests/blankNodePropertyList_containing_collection.trig
trig/tests/blankNodePropertyList_with_multiple_triples.nq
trig/tests/blankNodePropertyList_with_multiple_triples.trig
trig/tests/collection_object.nq
trig/tests/collection_object.trig
trig/tests/collection_subject.nq
trig/tests/collection_subject.trig
trig/tests/default_namespace_IRI.trig
trig/tests/double_lower_case_e.nq
trig/tests/double_lower_case_e.trig
trig/tests/empty_collection.nq
trig/tests/empty_collection.trig
trig/tests/first.nq
trig/tests/first.trig
trig/tests/labeled_blank_node_graph.nq
trig/tests/labeled_blank_node_graph.trig
trig/tests/labeled_blank_node_object.nq
trig/tests/labeled_blank_node_object.trig
trig/tests/labeled_blank_node_subject.nq
trig/tests/labeled_blank_node_subject.trig
trig/tests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig
trig/tests/labeled_blank_node_with_leading_digit.trig
trig/tests/labeled_blank_node_with_leading_underscore.trig
trig/tests/labeled_blank_node_with_non_leading_extras.trig
trig/tests/langtagged_LONG.trig
trig/tests/langtagged_LONG_with_subtag.nq
trig/tests/langtagged_LONG_with_subtag.trig
trig/tests/langtagged_non_LONG.nq
trig/tests/langtagged_non_LONG.trig
trig/tests/lantag_with_subtag.nq
trig/tests/lantag_with_subtag.trig
trig/tests/last.nq
trig/tests/last.trig
trig/tests/literal_false.nq
trig/tests/literal_false.trig
trig/tests/literal_true.nq
trig/tests/literal_true.trig
trig/tests/literal_with_BACKSPACE.nq
trig/tests/literal_with_BACKSPACE.trig
trig/tests/literal_with_CARRIAGE_RETURN.nq
trig/tests/literal_with_CARRIAGE_RETURN.trig
trig/tests/literal_with_CHARACTER_TABULATION.nq
trig/tests/literal_with_CHARACTER_TABULATION.trig
trig/tests/literal_with_FORM_FEED.nq
trig/tests/literal_with_FORM_FEED.trig
trig/tests/literal_with_LINE_FEED.nq
trig/tests/literal_with_LINE_FEED.trig
trig/tests/literal_with_REVERSE_SOLIDUS.nq
trig/tests/literal_with_REVERSE_SOLIDUS.trig
trig/tests/literal_with_escaped_BACKSPACE.trig
trig/tests/literal_with_escaped_CARRIAGE_RETURN.trig
trig/tests/literal_with_escaped_CHARACTER_TABULATION.trig
trig/tests/literal_with_escaped_FORM_FEED.trig
trig/tests/literal_with_escaped_LINE_FEED.trig
trig/tests/literal_with_numeric_escape4.nq
trig/tests/literal_with_numeric_escape4.trig
trig/tests/literal_with_numeric_escape8.trig
trig/tests/localName_with_PN_CHARS_BASE_character_boundaries.nq
trig/tests/localName_with_PN_CHARS_BASE_character_boundaries.trig
trig/tests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq
trig/tests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig
trig/tests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq
trig/tests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig
trig/tests/localName_with_leading_digit.nq
trig/tests/localName_with_leading_digit.trig
trig/tests/localName_with_leading_underscore.nq
trig/tests/localName_with_leading_underscore.trig
trig/tests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq
trig/tests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig
trig/tests/localName_with_non_leading_extras.nq
trig/tests/localName_with_non_leading_extras.trig
trig/tests/localname_with_COLON.nq
trig/tests/localname_with_COLON.trig
trig/tests/manifest.ttl
trig/tests/negative_numeric.nq
trig/tests/negative_numeric.trig
trig/tests/nested_blankNodePropertyLists.nq
trig/tests/nested_blankNodePropertyLists.trig
trig/tests/nested_collection.nq
trig/tests/nested_collection.trig
trig/tests/numeric_with_leading_0.nq
trig/tests/numeric_with_leading_0.trig
trig/tests/objectList_with_two_objects.nq
trig/tests/objectList_with_two_objects.trig
trig/tests/old_style_base.trig
trig/tests/old_style_prefix.trig
trig/tests/percent_escaped_localName.nq
trig/tests/percent_escaped_localName.trig
trig/tests/positive_numeric.nq
trig/tests/positive_numeric.trig
trig/tests/predicateObjectList_with_two_objectLists.nq
trig/tests/predicateObjectList_with_two_objectLists.trig
trig/tests/prefix_only_IRI.trig
trig/tests/prefix_reassigned_and_used.nq
trig/tests/prefix_reassigned_and_used.trig
trig/tests/prefix_with_PN_CHARS_BASE_character_boundaries.trig
trig/tests/prefix_with_non_leading_extras.trig
trig/tests/prefixed_IRI_object.trig
trig/tests/prefixed_IRI_predicate.trig
trig/tests/prefixed_name_datatype.trig
trig/tests/repeated_semis_at_end.trig
trig/tests/repeated_semis_not_at_end.nq
trig/tests/repeated_semis_not_at_end.trig
trig/tests/reserved_escaped_localName.nq
trig/tests/reserved_escaped_localName.trig
trig/tests/sole_blankNodePropertyList.trig
trig/tests/trig-eval-struct-01.nq
trig/tests/trig-eval-struct-01.trig
trig/tests/trig-eval-struct-02.nq
trig/tests/trig-eval-struct-02.trig
trig/tests/trig-subm-01.nq
trig/tests/trig-subm-01.trig
trig/tests/trig-subm-02.nq
trig/tests/trig-subm-02.trig
trig/tests/trig-subm-03.nq
trig/tests/trig-subm-03.trig
trig/tests/trig-subm-04.nq
trig/tests/trig-subm-04.trig
trig/tests/trig-subm-05.nq
trig/tests/trig-subm-05.trig
trig/tests/trig-subm-06.nq
trig/tests/trig-subm-06.trig
trig/tests/trig-subm-07.nq
trig/tests/trig-subm-07.trig
trig/tests/trig-subm-08.nq
trig/tests/trig-subm-08.trig
trig/tests/trig-subm-09.nq
trig/tests/trig-subm-09.trig
trig/tests/trig-subm-10.nq
trig/tests/trig-subm-10.trig
trig/tests/trig-subm-11.nq
trig/tests/trig-subm-11.trig
trig/tests/trig-subm-12.nq
trig/tests/trig-subm-12.trig
trig/tests/trig-subm-13.nq
trig/tests/trig-subm-13.trig
trig/tests/trig-subm-14.nq
trig/tests/trig-subm-14.trig
trig/tests/trig-subm-15.nq
trig/tests/trig-subm-15.trig
trig/tests/trig-subm-16.nq
trig/tests/trig-subm-16.trig
trig/tests/trig-subm-17.nq
trig/tests/trig-subm-17.trig
trig/tests/trig-subm-18.nq
trig/tests/trig-subm-18.trig
trig/tests/trig-subm-19.nq
trig/tests/trig-subm-19.trig
trig/tests/trig-subm-20.nq
trig/tests/trig-subm-20.trig
trig/tests/trig-subm-21.nq
trig/tests/trig-subm-21.trig
trig/tests/trig-subm-22.nq
trig/tests/trig-subm-22.trig
trig/tests/trig-subm-23.nq
trig/tests/trig-subm-23.trig
trig/tests/trig-subm-24.nq
trig/tests/trig-subm-24.trig
trig/tests/trig-subm-25.nq
trig/tests/trig-subm-25.trig
trig/tests/trig-subm-27.nq
trig/tests/trig-subm-27.trig
trig/tests/trig-syntax-bad-struct-03.trig
trig/tests/two_LITERAL_LONG2s.nq
trig/tests/underscore_in_localName.nq
--- a/trig/tests/HYPHEN_MINUS_in_localName.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/HYPHEN_MINUS_in_localName.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s-> <http://a.example/p> <http://a.example/o> .
-<http://a.example/s-> <http://a.example/p> <http://a.example/o> <g> .
+<http://a.example/s-> <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/HYPHEN_MINUS_in_localName.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/HYPHEN_MINUS_in_localName.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/>.
 {p:s- <http://a.example/p> <http://a.example/o> .}
-<g> {p:s- <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {p:s- <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/IRIREF_datatype.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/IRIREF_datatype.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://a.example/s> <http://a.example/p> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
+<http://a.example/s> <http://a.example/p> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
--- a/trig/tests/IRIREF_datatype.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/IRIREF_datatype.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .}
-<g> {<http://a.example/s> <http://a.example/p> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .}
--- a/trig/tests/IRI_spo.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/IRI_spo.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> <http://a.example/o> .
-<http://a.example/s> <http://a.example/p> <http://a.example/o> <g> .
+<http://a.example/s> <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/IRI_subject.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/IRI_subject.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> <http://a.example/o> .}
-<g> {<http://a.example/s> <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/IRI_with_all_punctuation.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/IRI_with_all_punctuation.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <scheme:!$%25&amp;'()*+,-./0123456789:/@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~?#> <http://a.example/p> <http://a.example/o> .
-<scheme:!$%25&amp;'()*+,-./0123456789:/@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~?#> <http://a.example/p> <http://a.example/o> <g> .
+<scheme:!$%25&amp;'()*+,-./0123456789:/@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~?#> <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/IRI_with_all_punctuation.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/IRI_with_all_punctuation.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<scheme:!$%25&amp;'()*+,-./0123456789:/@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~?#> <http://a.example/p> <http://a.example/o> .}
-<g> {<scheme:!$%25&amp;'()*+,-./0123456789:/@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~?#> <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {<scheme:!$%25&amp;'()*+,-./0123456789:/@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~?#> <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/IRI_with_eight_digit_numeric_escape.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/IRI_with_eight_digit_numeric_escape.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
-<http://a.example/\U00000073> <http://a.example/p> <http://a.example/o> .
-<http://a.example/\U00000073> <http://a.example/p> <http://a.example/o> <g> .
+{<http://a.example/\U00000073> <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {<http://a.example/\U00000073> <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/IRI_with_four_digit_numeric_escape.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/IRI_with_four_digit_numeric_escape.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/\u0073> <http://a.example/p> <http://a.example/o> .}
-<g> {<http://a.example/\u0073> <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {<http://a.example/\u0073> <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/LITERAL1.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL1.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "x" .
-<http://a.example/s> <http://a.example/p> "x" <g> .
+<http://a.example/s> <http://a.example/p> "x" <http://example/graph> .
--- a/trig/tests/LITERAL1.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL1.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> 'x' .}
-<g> {<http://a.example/s> <http://a.example/p> 'x' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> 'x' .}
--- a/trig/tests/LITERAL1_all_controls.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL1_all_controls.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000b\u000c\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f" .
-<http://a.example/s> <http://a.example/p> "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000b\u000c\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f" <g> .
+<http://a.example/s> <http://a.example/p> "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000b\u000c\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f" <http://example/graph> .
Binary file trig/tests/LITERAL1_all_controls.trig has changed
--- a/trig/tests/LITERAL1_all_punctuation.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL1_all_punctuation.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> " !\u0022#$%&():;<=>[email protected][]^_`{|}~" .
-<http://a.example/s> <http://a.example/p> " !\u0022#$%&():;<=>[email protected][]^_`{|}~" <g> .
+<http://a.example/s> <http://a.example/p> " !\u0022#$%&():;<=>[email protected][]^_`{|}~" <http://example/graph> .
--- a/trig/tests/LITERAL1_all_punctuation.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL1_all_punctuation.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> ' !"#$%&():;<=>[email protected][]^_`{|}~' .}
-<g> {<http://a.example/s> <http://a.example/p> ' !"#$%&():;<=>[email protected][]^_`{|}~' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> ' !"#$%&():;<=>[email protected][]^_`{|}~' .}
--- a/trig/tests/LITERAL1_ascii_boundaries.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL1_ascii_boundaries.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "\u0000\u0009\u000b\u000c\u000e\u0026\u0028\u005b\u005d\u007f" .
-<http://a.example/s> <http://a.example/p> "\u0000\u0009\u000b\u000c\u000e\u0026\u0028\u005b\u005d\u007f" <g> .
+<http://a.example/s> <http://a.example/p> "\u0000\u0009\u000b\u000c\u000e\u0026\u0028\u005b\u005d\u007f" <http://example/graph> .
Binary file trig/tests/LITERAL1_ascii_boundaries.trig has changed
--- a/trig/tests/LITERAL2.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL2.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> "x" .}
-<g> {<http://a.example/s> <http://a.example/p> "x" .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> "x" .}
--- a/trig/tests/LITERAL2_ascii_boundaries.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL2_ascii_boundaries.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "\u0000\u0009\u000b\u000c\u000e\u0021\u0023\u005b\u005d\u007f" .
-<http://a.example/s> <http://a.example/p> "\u0000\u0009\u000b\u000c\u000e\u0021\u0023\u005b\u005d\u007f" <g> .
+<http://a.example/s> <http://a.example/p> "\u0000\u0009\u000b\u000c\u000e\u0021\u0023\u005b\u005d\u007f" <http://example/graph> .
Binary file trig/tests/LITERAL2_ascii_boundaries.trig has changed
--- a/trig/tests/LITERAL_LONG1.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG1.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '''x''' .}
-<g> {<http://a.example/s> <http://a.example/p> '''x''' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '''x''' .}
--- a/trig/tests/LITERAL_LONG1_ascii_boundaries.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG1_ascii_boundaries.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "\u0000\u0026\u0028\u005b\u005d\u007f" .
-<http://a.example/s> <http://a.example/p> "\u0000\u0026\u0028\u005b\u005d\u007f" <g> .
+<http://a.example/s> <http://a.example/p> "\u0000\u0026\u0028\u005b\u005d\u007f" <http://example/graph> .
Binary file trig/tests/LITERAL_LONG1_ascii_boundaries.trig has changed
--- a/trig/tests/LITERAL_LONG1_with_1_squote.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG1_with_1_squote.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "x'y" .
-<http://a.example/s> <http://a.example/p> "x'y" <g> .
+<http://a.example/s> <http://a.example/p> "x'y" <http://example/graph> .
--- a/trig/tests/LITERAL_LONG1_with_1_squote.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG1_with_1_squote.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '''x'y''' .}
-<g> {<http://a.example/s> <http://a.example/p> '''x'y''' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '''x'y''' .}
--- a/trig/tests/LITERAL_LONG1_with_2_squotes.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG1_with_2_squotes.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "x''y" .
-<http://a.example/s> <http://a.example/p> "x''y" <g> .
+<http://a.example/s> <http://a.example/p> "x''y" <http://example/graph> .
--- a/trig/tests/LITERAL_LONG1_with_2_squotes.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG1_with_2_squotes.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '''x''y''' .}
-<http://example/g> {<http://a.example/s> <http://a.example/p> '''x''y''' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '''x''y''' .}
--- a/trig/tests/LITERAL_LONG2.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG2.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> """x""" .}
-<g> {<http://a.example/s> <http://a.example/p> """x""" .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> """x""" .}
--- a/trig/tests/LITERAL_LONG2_ascii_boundaries.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG2_ascii_boundaries.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "\u0000\u0021\u0023\u005b\u005d\u007f" .
-<http://a.example/s> <http://a.example/p> "\u0000\u0021\u0023\u005b\u005d\u007f" <g> .
+<http://a.example/s> <http://a.example/p> "\u0000\u0021\u0023\u005b\u005d\u007f" <http://example/graph> .
Binary file trig/tests/LITERAL_LONG2_ascii_boundaries.trig has changed
--- a/trig/tests/LITERAL_LONG2_with_1_squote.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG2_with_1_squote.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "x\"y" .
-<http://a.example/s> <http://a.example/p> "x\"y" <g> .
+<http://a.example/s> <http://a.example/p> "x\"y" <http://example/graph> .
--- a/trig/tests/LITERAL_LONG2_with_1_squote.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG2_with_1_squote.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> """x"y""" .}
-<g> {<http://a.example/s> <http://a.example/p> """x"y""" .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> """x"y""" .}
--- a/trig/tests/LITERAL_LONG2_with_2_squotes.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG2_with_2_squotes.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "x\"\"y" .
-<http://a.example/s> <http://a.example/p> "x\"\"y" <g> .
+<http://a.example/s> <http://a.example/p> "x\"\"y" <http://example/graph> .
--- a/trig/tests/LITERAL_LONG2_with_2_squotes.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG2_with_2_squotes.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> """x""y""" .}
-<g> {<http://a.example/s> <http://a.example/p> """x""y""" .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> """x""y""" .}
--- a/trig/tests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://example.org/ns#s> <http://example.org/ns#p1> "test-\\" .
-<http://example.org/ns#s> <http://example.org/ns#p1> "test-\\" <g> .
+<http://example.org/ns#s> <http://example.org/ns#p1> "test-\\" <http://example/graph> .
--- a/trig/tests/LITERAL_LONG2_with_REVERSE_SOLIDUS.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/LITERAL_LONG2_with_REVERSE_SOLIDUS.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 @prefix : <http://example.org/ns#> .
 
 {:s :p1 """test-\\""" .}
-<g> {:s :p1 """test-\\""" .}
+<http://example/graph> {:s :p1 """test-\\""" .}
--- a/trig/tests/README	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/README	Thu Jun 13 16:38:07 2013 -0700
@@ -30,8 +30,8 @@
 Per RFC 3986 section 5.1.3, the base IRI for parsing each file is the
 retrieval IRI for that file. For example, the tests trig-subm-01 and
 trig-subm-27 require relative IRI resolution against a base of
-<http://www.w3.org/2013/TriGTests/trig-subm-01.ttl> and
-<http://www.w3.org/2013/TriGTests/trig-subm-27.ttl> respectively.
+<http://www.w3.org/2013/TriGTests/trig-subm-01.trig> and
+<http://www.w3.org/2013/TriGTests/trig-subm-27.trig> respectively.
 
 
 See http://www.w3.org/2011/rdf-wg/wiki/TriG_Test_Suite for more details.
--- a/trig/tests/SPARQL_style_base.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/SPARQL_style_base.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 BASE <http://a.example/>
 {<s> <http://a.example/p> <http://a.example/o> .}
-<g> {<s> <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {<s> <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/SPARQL_style_prefix.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/SPARQL_style_prefix.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 PREFIX p: <http://a.example/>
 {p:s <http://a.example/p> <http://a.example/o> .}
-<g> {p:s <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {p:s <http://a.example/p> <http://a.example/o> .}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trig/tests/anonymous_blank_node_graph.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -0,0 +1,1 @@
+[] {<http://a.example/s> <http://a.example/p> <http://a.example/o> .}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trig/tests/anonymous_blank_node_object.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -0,0 +1,2 @@
+<http://a.example/s> <http://a.example/p> _:b1 .
+<http://a.example/s> <http://a.example/p> _:b2 <http://example/graph> .
--- a/trig/tests/anonymous_blank_node_object.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/anonymous_blank_node_object.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,1 +1,2 @@
-<http://a.example/s> <http://a.example/p> [] .
+{<http://a.example/s> <http://a.example/p> [] .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> [] .}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trig/tests/anonymous_blank_node_subject.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -0,0 +1,2 @@
+_:b1 <http://a.example/p> <http://a.example/o> .
+_:b2 <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/anonymous_blank_node_subject.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/anonymous_blank_node_subject.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {[] <http://a.example/p> <http://a.example/o> .}
-<http://example/g> {[] <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {[] <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/bareword_a_predicate.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/bareword_a_predicate.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://a.example/o> .
-<http://a.example/s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://a.example/o> <http://example/g> .
+<http://a.example/s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/bareword_a_predicate.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/bareword_a_predicate.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> a <http://a.example/o> .}
-<http://example/g> {<http://a.example/s> a <http://a.example/o> .}
+<http://example/graph> {<http://a.example/s> a <http://a.example/o> .}
--- a/trig/tests/bareword_decimal.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/bareword_decimal.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,1 +1,2 @@
 <http://a.example/s> <http://a.example/p> "1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> .
+<http://a.example/s> <http://a.example/p> "1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> <http://example/graph> .
--- a/trig/tests/bareword_decimal.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/bareword_decimal.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,1 +1,2 @@
-<http://a.example/s> <http://a.example/p> 1.0 .
+{<http://a.example/s> <http://a.example/p> 1.0 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> 1.0 .}
--- a/trig/tests/bareword_double.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/bareword_double.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "1E0"^^<http://www.w3.org/2001/XMLSchema#double> .
-<http://a.example/s> <http://a.example/p> "1E0"^^<http://www.w3.org/2001/XMLSchema#double> <http://example/g> .
+<http://a.example/s> <http://a.example/p> "1E0"^^<http://www.w3.org/2001/XMLSchema#double> <http://example/graph> .
--- a/trig/tests/bareword_double.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/bareword_double.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> 1E0 .}
-<http://example/g> {<http://a.example/s> <http://a.example/p> 1E0 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> 1E0 .}
--- a/trig/tests/bareword_integer.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/bareword_integer.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> 1 .}
-<http://example/g/> {<http://a.example/s> <http://a.example/p> 1 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> 1 .}
--- a/trig/tests/blankNodePropertyList_as_object.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/blankNodePropertyList_as_object.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 <http://a.example/s> <http://a.example/p> _:b1 .
 _:b1 <http://a.example/p2> <http://a.example/o2> .
-<http://a.example/s> <http://a.example/p> _:b2 <http://example/g> .
-_:b2 <http://a.example/p2> <http://a.example/o2> <http://example/g>  .
+<http://a.example/s> <http://a.example/p> _:b2 <http://example/graph> .
+_:b2 <http://a.example/p2> <http://a.example/o2> <http://example/graph>  .
--- a/trig/tests/blankNodePropertyList_as_object.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/blankNodePropertyList_as_object.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> [ <http://a.example/p2> <http://a.example/o2> ] .}
-<http://example/g> {<http://a.example/s> <http://a.example/p> [ <http://a.example/p2> <http://a.example/o2> ] .}
\ No newline at end of file
+<http://example/graph> {<http://a.example/s> <http://a.example/p> [ <http://a.example/p2> <http://a.example/o2> ] .}
\ No newline at end of file
--- a/trig/tests/blankNodePropertyList_as_subject.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/blankNodePropertyList_as_subject.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 _:b1 <http://a.example/p> <http://a.example/o> .
 _:b1 <http://a.example/p2> <http://a.example/o2> .
-_:b2 <http://a.example/p> <http://a.example/o> <http://example/g> .
-_:b2 <http://a.example/p2> <http://a.example/o2> <http://example/g>  .
+_:b2 <http://a.example/p> <http://a.example/o> <http://example/graph> .
+_:b2 <http://a.example/p2> <http://a.example/o2> <http://example/graph>  .
--- a/trig/tests/blankNodePropertyList_as_subject.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/blankNodePropertyList_as_subject.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {[ <http://a.example/p> <http://a.example/o> ] <http://a.example/p2> <http://a.example/o2> .}
-<http://example/g> {[ <http://a.example/p> <http://a.example/o> ] <http://a.example/p2> <http://a.example/o2> .}
+<http://example/graph> {[ <http://a.example/p> <http://a.example/o> ] <http://a.example/p2> <http://a.example/o2> .}
--- a/trig/tests/blankNodePropertyList_containing_collection.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/blankNodePropertyList_containing_collection.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,6 +1,6 @@
 _:b1 <http://a.example/p1> _:el1 .
 _:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
 _:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-_:b2 <http://a.example/p1> _:el2 <http://example/g> .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/g> .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/g> .
+_:b2 <http://a.example/p1> _:el2 <http://example/graph> .
+_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
--- a/trig/tests/blankNodePropertyList_containing_collection.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/blankNodePropertyList_containing_collection.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {[ <http://a.example/p1> (1) ] .}
-<http://example/g> {[ <http://a.example/p1> (1) ] .}
+<http://example/graph> {[ <http://a.example/p1> (1) ] .}
--- a/trig/tests/blankNodePropertyList_with_multiple_triples.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/blankNodePropertyList_with_multiple_triples.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,6 +1,6 @@
 _:b1 <http://a.example/p1> <http://a.example/o1> .
 _:b1 <http://a.example/p2> <http://a.example/o2> .
 _:b1 <http://a.example/p> <http://a.example/o> .
-_:b2 <http://a.example/p1> <http://a.example/o1> .
-_:b2 <http://a.example/p2> <http://a.example/o2> .
-_:b2 <http://a.example/p> <http://a.example/o> .
+_:b2 <http://a.example/p1> <http://a.example/o1> <http://example/graph> .
+_:b2 <http://a.example/p2> <http://a.example/o2> <http://example/graph> .
+_:b2 <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/blankNodePropertyList_with_multiple_triples.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/blankNodePropertyList_with_multiple_triples.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {[ <http://a.example/p1> <http://a.example/o1> ; <http://a.example/p2> <http://a.example/o2> ] <http://a.example/p> <http://a.example/o> .}
-<http://example/g> {[ <http://a.example/p1> <http://a.example/o1> ; <http://a.example/p2> <http://a.example/o2> ] <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {[ <http://a.example/p1> <http://a.example/o1> ; <http://a.example/p2> <http://a.example/o2> ] <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/collection_object.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/collection_object.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,6 +1,6 @@
 <http://a.example/s> <http://a.example/p> _:el1 .
 _:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
 _:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-<http://a.example/s> <http://a.example/p> _:el2 <g> .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <g> .
+<http://a.example/s> <http://a.example/p> _:el2 <http://example/graph> .
+_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
--- a/trig/tests/collection_object.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/collection_object.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> (1) .}
-<g> {<http://a.example/s> <http://a.example/p> (1) .}
\ No newline at end of file
+<http://example/graph> {<http://a.example/s> <http://a.example/p> (1) .}
\ No newline at end of file
--- a/trig/tests/collection_subject.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/collection_subject.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,6 +1,6 @@
 _:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
 _:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
 _:el1 <http://a.example/p> <http://a.example/o> .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <g> .
-_:el2 <http://a.example/p> <http://a.example/o> <g> .
+_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
+_:el2 <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/collection_subject.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/collection_subject.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {(1) <http://a.example/p> <http://a.example/o> .}
-<g> {(1) <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {(1) <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/default_namespace_IRI.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/default_namespace_IRI.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix : <http://a.example/>.
 {:s <http://a.example/p> <http://a.example/o> .}
-<g> {:s <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {:s <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/double_lower_case_e.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/double_lower_case_e.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "1e0"^^<http://www.w3.org/2001/XMLSchema#double> .
-<http://a.example/s> <http://a.example/p> "1e0"^^<http://www.w3.org/2001/XMLSchema#double> <g> .
+<http://a.example/s> <http://a.example/p> "1e0"^^<http://www.w3.org/2001/XMLSchema#double> <http://example/graph> .
--- a/trig/tests/double_lower_case_e.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/double_lower_case_e.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> 1e0 .}
-<g> {<http://a.example/s> <http://a.example/p> 1e0 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> 1e0 .}
--- a/trig/tests/empty_collection.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/empty_collection.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-<http://a.example/s> <http://a.example/p> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <g> .
+<http://a.example/s> <http://a.example/p> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
--- a/trig/tests/empty_collection.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/empty_collection.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> () .}
-<g> {<http://a.example/s> <http://a.example/p> () .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> () .}
--- a/trig/tests/first.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/first.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -5,10 +5,10 @@
 _:outerEl1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:outerEl2 .
 _:outerEl2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "2"^^<http://www.w3.org/2001/XMLSchema#integer> .
 _:outerEl2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-<http://a.example/s> <http://a.example/p> _:outerEl3 .
-_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:innerEl3 .
-_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
-_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:outerEl4 .
-_:outerEl4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "2"^^<http://www.w3.org/2001/XMLSchema#integer> .
-_:outerEl4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+<http://a.example/s> <http://a.example/p> _:outerEl3 <http://example/graph> .
+_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:innerEl3 <http://example/graph> .
+_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
+_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:outerEl4 <http://example/graph> .
+_:outerEl4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "2"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+_:outerEl4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
--- a/trig/tests/first.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/first.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> ((1) 2) .}
-<g> {<http://a.example/s> <http://a.example/p> ((1) 2) .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> ((1) 2) .}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trig/tests/labeled_blank_node_graph.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -0,0 +1,1 @@
+<http://a.example/s> <http://a.example/p> <http://a.example/o> _:b1 .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trig/tests/labeled_blank_node_graph.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -0,0 +1,1 @@
+_:g {<http://a.example/s> <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/labeled_blank_node_object.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/labeled_blank_node_object.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> _:b1 .
-<http://a.example/s> <http://a.example/p> _:b1 <g> .
+<http://a.example/s> <http://a.example/p> _:b1 <http://example/graph> .
--- a/trig/tests/labeled_blank_node_object.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/labeled_blank_node_object.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> _:o .}
-<g> {<http://a.example/s> <http://a.example/p> _:o .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> _:o .}
--- a/trig/tests/labeled_blank_node_subject.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/labeled_blank_node_subject.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 _:b1 <http://a.example/p> <http://a.example/o> .
-_:b1 <http://a.example/p> <http://a.example/o> <g> .
+_:b1 <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/labeled_blank_node_subject.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/labeled_blank_node_subject.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {_:s <http://a.example/p> <http://a.example/o> .}
-<g> {_:s <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {_:s <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> _:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿿 .}
-<g> {<http://a.example/s> <http://a.example/p> _:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿿 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> _:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿿 .}
--- a/trig/tests/labeled_blank_node_with_leading_digit.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/labeled_blank_node_with_leading_digit.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> _:0 .}
-<g> {<http://a.example/s> <http://a.example/p> _:0 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> _:0 .}
--- a/trig/tests/labeled_blank_node_with_leading_underscore.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/labeled_blank_node_with_leading_underscore.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> _:_ .}
-<g> {<http://a.example/s> <http://a.example/p> _:_ .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> _:_ .}
--- a/trig/tests/labeled_blank_node_with_non_leading_extras.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/labeled_blank_node_with_non_leading_extras.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> _:a·̀ͯ‿.⁀ .}
-<g> {<http://a.example/s> <http://a.example/p> _:a·̀ͯ‿.⁀ .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> _:a·̀ͯ‿.⁀ .}
--- a/trig/tests/langtagged_LONG.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/langtagged_LONG.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
-<http://a.example/s> <http://a.example/p> """chat"""@en .
-<http://a.example/s> <http://a.example/p> """chat"""@en <g> .
+{<http://a.example/s> <http://a.example/p> """chat"""@en .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> """chat"""@en .}
--- a/trig/tests/langtagged_LONG_with_subtag.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/langtagged_LONG_with_subtag.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://example.org/ex#a> <http://example.org/ex#b> "Cheers"@en-UK .
-<http://example.org/ex#a> <http://example.org/ex#b> "Cheers"@en-UK <g> .
+<http://example.org/ex#a> <http://example.org/ex#b> "Cheers"@en-UK <http://example/graph> .
--- a/trig/tests/langtagged_LONG_with_subtag.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/langtagged_LONG_with_subtag.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 # Test long literal with lang tag
 @prefix :  <http://example.org/ex#> .
 {:a :b """Cheers"""@en-UK .}
-<g> {:a :b """Cheers"""@en-UK .}
+<http://example/graph> {:a :b """Cheers"""@en-UK .}
--- a/trig/tests/langtagged_non_LONG.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/langtagged_non_LONG.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "chat"@en .
-<http://a.example/s> <http://a.example/p> "chat"@en <g> .
+<http://a.example/s> <http://a.example/p> "chat"@en <http://example/graph> .
--- a/trig/tests/langtagged_non_LONG.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/langtagged_non_LONG.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> "chat"@en .}
-<g> {<http://a.example/s> <http://a.example/p> "chat"@en .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> "chat"@en .}
--- a/trig/tests/lantag_with_subtag.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/lantag_with_subtag.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "chat"@en-us .
-<http://a.example/s> <http://a.example/p> "chat"@en-us <g> .
+<http://a.example/s> <http://a.example/p> "chat"@en-us <http://example/graph> .
--- a/trig/tests/lantag_with_subtag.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/lantag_with_subtag.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> "chat"@en-us .}
-<g> {<http://a.example/s> <http://a.example/p> "chat"@en-us .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> "chat"@en-us .}
--- a/trig/tests/last.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/last.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -5,10 +5,10 @@
 _:innerEl1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "2"^^<http://www.w3.org/2001/XMLSchema#integer> .
 _:innerEl1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
 _:outerEl2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-<http://a.example/s> <http://a.example/p> _:outerEl3 .
-_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
-_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:outerEl4 .
-_:outerEl4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:innerEl3 .
-_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "2"^^<http://www.w3.org/2001/XMLSchema#integer> .
-_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-_:outerEl4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+<http://a.example/s> <http://a.example/p> _:outerEl3 <http://example/graph> .
+_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:outerEl4 <http://example/graph> .
+_:outerEl4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:innerEl3 <http://example/graph> .
+_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "2"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
+_:outerEl4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
--- a/trig/tests/last.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/last.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> (1 (2)) .}
-<g> {<http://a.example/s> <http://a.example/p> (1 (2)) .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> (1 (2)) .}
--- a/trig/tests/literal_false.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_false.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "false"^^<http://www.w3.org/2001/XMLSchema#boolean> .
-<http://a.example/s> <http://a.example/p> "false"^^<http://www.w3.org/2001/XMLSchema#boolean> <g> .
+<http://a.example/s> <http://a.example/p> "false"^^<http://www.w3.org/2001/XMLSchema#boolean> <http://example/graph> .
--- a/trig/tests/literal_false.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_false.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> false .}
-<g> {<http://a.example/s> <http://a.example/p> false .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> false .}
--- a/trig/tests/literal_true.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_true.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> .
-<http://a.example/s> <http://a.example/p> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> <g> .
+<http://a.example/s> <http://a.example/p> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> <http://example/graph> .
--- a/trig/tests/literal_true.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_true.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> true .}
-<g> {<http://a.example/s> <http://a.example/p> true .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> true .}
--- a/trig/tests/literal_with_BACKSPACE.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_BACKSPACE.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "\u0008" .
-<http://a.example/s> <http://a.example/p> "\u0008" <g> .
+<http://a.example/s> <http://a.example/p> "\u0008" <http://example/graph> .
--- a/trig/tests/literal_with_BACKSPACE.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_BACKSPACE.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '' .}
-<g> {<http://a.example/s> <http://a.example/p> '' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '' .}
--- a/trig/tests/literal_with_CARRIAGE_RETURN.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_CARRIAGE_RETURN.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "\r" .
-<http://a.example/s> <http://a.example/p> "\r" <g> .
+<http://a.example/s> <http://a.example/p> "\r" <http://example/graph> .
--- a/trig/tests/literal_with_CARRIAGE_RETURN.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_CARRIAGE_RETURN.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,2 @@
-{<http://a.example/s> <http://a.example/p> '''
-''' .}
-<g> {<http://a.example/s> <http://a.example/p> '''
-''' .}
\ No newline at end of file
+{<http://a.example/s> <http://a.example/p> '''
''' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '''
''' .}
\ No newline at end of file
--- a/trig/tests/literal_with_CHARACTER_TABULATION.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_CHARACTER_TABULATION.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "\t" .
-<http://a.example/s> <http://a.example/p> "\t" <g> .
+<http://a.example/s> <http://a.example/p> "\t" <http://example/graph> .
--- a/trig/tests/literal_with_CHARACTER_TABULATION.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_CHARACTER_TABULATION.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '	' .}
-<g> {<http://a.example/s> <http://a.example/p> '	' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '	' .}
--- a/trig/tests/literal_with_FORM_FEED.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_FORM_FEED.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "\u000C" .
-<http://a.example/s> <http://a.example/p> "\u000C" <g> .
+<http://a.example/s> <http://a.example/p> "\u000C" <http://example/graph> .
--- a/trig/tests/literal_with_FORM_FEED.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_FORM_FEED.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '' .}
-<g> {<http://a.example/s> <http://a.example/p> '' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '' .}
--- a/trig/tests/literal_with_LINE_FEED.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_LINE_FEED.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "\n" .
-<http://a.example/s> <http://a.example/p> "\n" <g> .
+<http://a.example/s> <http://a.example/p> "\n" <http://example/graph> .
--- a/trig/tests/literal_with_LINE_FEED.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_LINE_FEED.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,4 @@
 {<http://a.example/s> <http://a.example/p> '''
 ''' .}
-<g> 
\ No newline at end of file
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '''
+''' .}
\ No newline at end of file
--- a/trig/tests/literal_with_REVERSE_SOLIDUS.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_REVERSE_SOLIDUS.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "\\" .
-<http://a.example/s> <http://a.example/p> "\\" <g> .
+<http://a.example/s> <http://a.example/p> "\\" <http://example/graph> .
--- a/trig/tests/literal_with_REVERSE_SOLIDUS.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_REVERSE_SOLIDUS.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '\\' .}
-<g> {<http://a.example/s> <http://a.example/p> '\\' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '\\' .}
--- a/trig/tests/literal_with_escaped_BACKSPACE.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_escaped_BACKSPACE.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '\b' .}
-<g> {<http://a.example/s> <http://a.example/p> '\b' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '\b' .}
--- a/trig/tests/literal_with_escaped_CARRIAGE_RETURN.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_escaped_CARRIAGE_RETURN.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '\r' .}
-<g> {<http://a.example/s> <http://a.example/p> '\r' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '\r' .}
--- a/trig/tests/literal_with_escaped_CHARACTER_TABULATION.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_escaped_CHARACTER_TABULATION.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '\t' .}
-<g> {<http://a.example/s> <http://a.example/p> '\t' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '\t' .}
--- a/trig/tests/literal_with_escaped_FORM_FEED.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_escaped_FORM_FEED.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '\f' .}
-<g> {<http://a.example/s> <http://a.example/p> '\f' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '\f' .}
--- a/trig/tests/literal_with_escaped_LINE_FEED.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_escaped_LINE_FEED.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '\n' .}
-<g> {<http://a.example/s> <http://a.example/p> '\n' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '\n' .}
--- a/trig/tests/literal_with_numeric_escape4.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_numeric_escape4.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "o" .
-<http://a.example/s> <http://a.example/p> "o" <g> .
+<http://a.example/s> <http://a.example/p> "o" <http://example/graph> .
--- a/trig/tests/literal_with_numeric_escape4.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_numeric_escape4.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '\u006F' .}
-<g> {<http://a.example/s> <http://a.example/p> '\u006F' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '\u006F' .}
--- a/trig/tests/literal_with_numeric_escape8.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/literal_with_numeric_escape8.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> '\U0000006F' .}
-<g> {<http://a.example/s> <http://a.example/p> '\U0000006F' .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> '\U0000006F' .}
--- a/trig/tests/localName_with_PN_CHARS_BASE_character_boundaries.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_PN_CHARS_BASE_character_boundaries.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u037f\u1fff\u200c\u200d\u2070\u218f\u2c00\u2fef\u3001\ud7ff\uf900\ufdcf\ufdf0\uffef\U00010000\U000efffd> .
-<http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u037f\u1fff\u200c\u200d\u2070\u218f\u2c00\u2fef\u3001\ud7ff\uf900\ufdcf\ufdf0\uffef\U00010000\U000efffd> <g> .
+<http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u037f\u1fff\u200c\u200d\u2070\u218f\u2c00\u2fef\u3001\ud7ff\uf900\ufdcf\ufdf0\uffef\U00010000\U000efffd> <http://example/graph> .
--- a/trig/tests/localName_with_PN_CHARS_BASE_character_boundaries.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_PN_CHARS_BASE_character_boundaries.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/> .
 {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ￯𐀀󯿽 .}
-<g> {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ￯𐀀󯿽 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ￯𐀀󯿽 .}
--- a/trig/tests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u0384\u1ffe\u200c\u200d\u2070\u2189\u2c00\u2fd5\u3001\ud7fb\ufa0e\ufdc7\ufdf0\uffef\U00010000\U000e01ef> .
-<http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u0384\u1ffe\u200c\u200d\u2070\u2189\u2c00\u2fd5\u3001\ud7fb\ufa0e\ufdc7\ufdf0\uffef\U00010000\U000e01ef> <g> .
+<http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u0384\u1ffe\u200c\u200d\u2070\u2189\u2c00\u2fd5\u3001\ud7fb\ufa0e\ufdc7\ufdf0\uffef\U00010000\U000e01ef> <http://example/graph> .
--- a/trig/tests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/> .
 {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿Ͱͽ΄῾‌‍⁰↉Ⰰ⿕、ퟻ﨎ﷇﷰ￯𐀀󠇯 .}
-<g> {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿Ͱͽ΄῾‌‍⁰↉Ⰰ⿕、ퟻ﨎ﷇﷰ￯𐀀󠇯 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿Ͱͽ΄῾‌‍⁰↉Ⰰ⿕、ퟻ﨎ﷇﷰ￯𐀀󠇯 .}
--- a/trig/tests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u0384\u1ffe\u200c\u200d\u2070\u2189\u2c00\u2fd5\u3001\ud7fb\ufa0e\ufdc7\ufdf0\uffef> .
-<http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u0384\u1ffe\u200c\u200d\u2070\u2189\u2c00\u2fd5\u3001\ud7fb\ufa0e\ufdc7\ufdf0\uffef> <g> .
+<http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u0384\u1ffe\u200c\u200d\u2070\u2189\u2c00\u2fd5\u3001\ud7fb\ufa0e\ufdc7\ufdf0\uffef> <http://example/graph> .
--- a/trig/tests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/> .
 {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿Ͱͽ΄῾‌‍⁰↉Ⰰ⿕、ퟻ﨎ﷇﷰ￯ .}
-<g> {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿Ͱͽ΄῾‌‍⁰↉Ⰰ⿕、ퟻ﨎ﷇﷰ￯ .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿Ͱͽ΄῾‌‍⁰↉Ⰰ⿕、ퟻ﨎ﷇﷰ￯ .}
--- a/trig/tests/localName_with_leading_digit.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_leading_digit.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/0> <http://a.example/p> <http://a.example/o> .
-<http://a.example/0> <http://a.example/p> <http://a.example/o> <g> .
+<http://a.example/0> <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/localName_with_leading_digit.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_leading_digit.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/>.
 {p:0 <http://a.example/p> <http://a.example/o> .}
-<g> {p:0 <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {p:0 <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/localName_with_leading_underscore.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_leading_underscore.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/_> <http://a.example/p> <http://a.example/o> .
-<http://a.example/_> <http://a.example/p> <http://a.example/o> <g> .
+<http://a.example/_> <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/localName_with_leading_underscore.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_leading_underscore.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/>.
 {p:_ <http://a.example/p> <http://a.example/o> .}
-<g> {p:_ <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {p:_ <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u037f\u1fff\u200c\u200d\u2070\u218f\u2c00\u2fef\u3001\ud7ff\ufa0e\ufdcf\ufdf0\uffef\U00010000\U000efffd> .
-<http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u037f\u1fff\u200c\u200d\u2070\u218f\u2c00\u2fef\u3001\ud7ff\ufa0e\ufdcf\ufdf0\uffef\U00010000\U000efffd> <g> .
+<http://a.example/s> <http://a.example/p> <http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u037f\u1fff\u200c\u200d\u2070\u218f\u2c00\u2fef\u3001\ud7ff\ufa0e\ufdcf\ufdf0\uffef\U00010000\U000efffd> <http://example/graph> .
--- a/trig/tests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/> .
 {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿﨎﷏ﷰ￯𐀀󯿽 .}
-<g> {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿﨎﷏ﷰ￯𐀀󯿽 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> p:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿﨎﷏ﷰ￯𐀀󯿽 .}
--- a/trig/tests/localName_with_non_leading_extras.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_non_leading_extras.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/a·̀ͯ‿.⁀> <http://a.example/p> <http://a.example/o> .
-<http://a.example/a·̀ͯ‿.⁀> <http://a.example/p> <http://a.example/o> <g> .
+<http://a.example/a·̀ͯ‿.⁀> <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/localName_with_non_leading_extras.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localName_with_non_leading_extras.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/>.
 {p:a·̀ͯ‿.⁀ <http://a.example/p> <http://a.example/o> .}
-<g> {p:a·̀ͯ‿.⁀ <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {p:a·̀ͯ‿.⁀ <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/localname_with_COLON.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localname_with_COLON.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s:> <http://a.example/p> <http://a.example/o> .
-<http://a.example/s:> <http://a.example/p> <http://a.example/o> <g>.
+<http://a.example/s:> <http://a.example/p> <http://a.example/o> <http://example/graph>.
--- a/trig/tests/localname_with_COLON.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/localname_with_COLON.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/>.
 {p:s: <http://a.example/p> <http://a.example/o> .}
-<g> {p:s: <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {p:s: <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/manifest.ttl	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/manifest.ttl	Thu Jun 13 16:38:07 2013 -0700
@@ -50,12 +50,14 @@
     <#SPARQL_style_base>
     <#labeled_blank_node_subject>
     <#labeled_blank_node_object>
+    <#labeled_blank_node_graph>
     <#labeled_blank_node_with_PN_CHARS_BASE_character_boundaries>
     <#labeled_blank_node_with_leading_underscore>
     <#labeled_blank_node_with_leading_digit>
     <#labeled_blank_node_with_non_leading_extras>
     <#anonymous_blank_node_subject>
     <#anonymous_blank_node_object>
+    <#anonymous_blank_node_graph>
     <#sole_blankNodePropertyList>
     <#blankNodePropertyList_as_subject>
     <#blankNodePropertyList_as_object>
@@ -317,7 +319,7 @@
 <#IRI_subject> rdf:type rdft:TestTurtleEval ;
    mf:name      "IRI_subject" ;
    rdfs:comment "IRI subject" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <IRI_subject.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -325,7 +327,7 @@
 <#IRI_with_four_digit_numeric_escape> rdf:type rdft:TestTurtleEval ;
    mf:name      "IRI_with_four_digit_numeric_escape" ;
    rdfs:comment "IRI with four digit numeric escape (\\u)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <IRI_with_four_digit_numeric_escape.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -333,7 +335,7 @@
 <#IRI_with_eight_digit_numeric_escape> rdf:type rdft:TestTurtleEval ;
    mf:name      "IRI_with_eight_digit_numeric_escape" ;
    rdfs:comment "IRI with eight digit numeric escape (\\U)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <IRI_with_eight_digit_numeric_escape.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -341,7 +343,7 @@
 <#IRI_with_all_punctuation> rdf:type rdft:TestTurtleEval ;
    mf:name      "IRI_with_all_punctuation" ;
    rdfs:comment "IRI with all punctuation" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <IRI_with_all_punctuation.trig> ;
    mf:result    <IRI_with_all_punctuation.nq> ;
    .
@@ -349,7 +351,7 @@
 <#bareword_a_predicate> rdf:type rdft:TestTurtleEval ;
    mf:name      "bareword_a_predicate" ;
    rdfs:comment "bareword a predicate" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <bareword_a_predicate.trig> ;
    mf:result    <bareword_a_predicate.nq> ;
    .
@@ -357,7 +359,7 @@
 <#old_style_prefix> rdf:type rdft:TestTurtleEval ;
    mf:name      "old_style_prefix" ;
    rdfs:comment "old-style prefix" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <old_style_prefix.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -365,7 +367,7 @@
 <#SPARQL_style_prefix> rdf:type rdft:TestTurtleEval ;
    mf:name      "SPARQL_style_prefix" ;
    rdfs:comment "SPARQL-style prefix" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <SPARQL_style_prefix.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -373,7 +375,7 @@
 <#prefixed_IRI_predicate> rdf:type rdft:TestTurtleEval ;
    mf:name      "prefixed_IRI_predicate" ;
    rdfs:comment "prefixed IRI predicate" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <prefixed_IRI_predicate.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -381,7 +383,7 @@
 <#prefixed_IRI_object> rdf:type rdft:TestTurtleEval ;
    mf:name      "prefixed_IRI_object" ;
    rdfs:comment "prefixed IRI object" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <prefixed_IRI_object.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -389,7 +391,7 @@
 <#prefix_only_IRI> rdf:type rdft:TestTurtleEval ;
    mf:name      "prefix_only_IRI" ;
    rdfs:comment "prefix-only IRI (p:)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <prefix_only_IRI.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -397,7 +399,7 @@
 <#prefix_with_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTurtleEval ;
    mf:name      "prefix_with_PN_CHARS_BASE_character_boundaries" ;
    rdfs:comment "prefix with PN CHARS BASE character boundaries (prefix: AZazÀÖØöø...:)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <prefix_with_PN_CHARS_BASE_character_boundaries.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -405,7 +407,7 @@
 <#prefix_with_non_leading_extras> rdf:type rdft:TestTurtleEval ;
    mf:name      "prefix_with_non_leading_extras" ;
    rdfs:comment "prefix with_non_leading_extras (_:a·̀ͯ‿.⁀)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <prefix_with_non_leading_extras.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -413,7 +415,7 @@
 <#localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTurtleEval ;
    mf:name      "localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries" ;
    rdfs:comment "localName with assigned, NFC-normalized, basic-multilingual-plane PN CHARS BASE character boundaries (p:AZazÀÖØöø...)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig> ;
    mf:result    <localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq> ;
    .
@@ -421,7 +423,7 @@
 <#localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTurtleEval ;
    mf:name      "localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries" ;
    rdfs:comment "localName with assigned, NFC-normalized PN CHARS BASE character boundaries (p:AZazÀÖØöø...)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig> ;
    mf:result    <localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq> ;
    .
@@ -429,7 +431,7 @@
 <#localName_with_nfc_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTurtleEval ;
    mf:name      "localName_with_nfc_PN_CHARS_BASE_character_boundaries" ;
    rdfs:comment "localName with nfc-normalize PN CHARS BASE character boundaries (p:AZazÀÖØöø...)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig> ;
    mf:result    <localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq> ;
    .
@@ -445,7 +447,7 @@
 <#default_namespace_IRI> rdf:type rdft:TestTurtleEval ;
    mf:name      "default_namespace_IRI" ;
    rdfs:comment "default namespace IRI (:ln)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <default_namespace_IRI.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -453,7 +455,7 @@
 <#prefix_reassigned_and_used> rdf:type rdft:TestTurtleEval ;
    mf:name      "prefix_reassigned_and_used" ;
    rdfs:comment "prefix reassigned and used" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <prefix_reassigned_and_used.trig> ;
    mf:result    <prefix_reassigned_and_used.nq> ;
    .
@@ -461,7 +463,7 @@
 <#reserved_escaped_localName> rdf:type rdft:TestTurtleEval ;
    mf:name      "reserved_escaped_localName" ;
    rdfs:comment "reserved-escaped local name" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <reserved_escaped_localName.trig> ;
    mf:result    <reserved_escaped_localName.nq> ;
    .
@@ -469,7 +471,7 @@
 <#percent_escaped_localName> rdf:type rdft:TestTurtleEval ;
    mf:name      "percent_escaped_localName" ;
    rdfs:comment "percent-escaped local name" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <percent_escaped_localName.trig> ;
    mf:result    <percent_escaped_localName.nq> ;
    .
@@ -477,7 +479,7 @@
 <#HYPHEN_MINUS_in_localName> rdf:type rdft:TestTurtleEval ;
    mf:name      "HYPHEN_MINUS_in_localName" ;
    rdfs:comment "HYPHEN-MINUS in local name" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <HYPHEN_MINUS_in_localName.trig> ;
    mf:result    <HYPHEN_MINUS_in_localName.nq> ;
    .
@@ -485,7 +487,7 @@
 <#underscore_in_localName> rdf:type rdft:TestTurtleEval ;
    mf:name      "underscore_in_localName" ;
    rdfs:comment "underscore in local name" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <underscore_in_localName.trig> ;
    mf:result    <underscore_in_localName.nq> ;
    .
@@ -493,7 +495,7 @@
 <#localname_with_COLON> rdf:type rdft:TestTurtleEval ;
    mf:name      "localname_with_COLON" ;
    rdfs:comment "localname with COLON" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <localname_with_COLON.trig> ;
    mf:result    <localname_with_COLON.nq> ;
    .
@@ -501,7 +503,7 @@
 <#localName_with_leading_underscore> rdf:type rdft:TestTurtleEval ;
    mf:name      "localName_with_leading_underscore" ;
    rdfs:comment "localName with leading underscore (p:_)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <localName_with_leading_underscore.trig> ;
    mf:result    <localName_with_leading_underscore.nq> ;
    .
@@ -509,7 +511,7 @@
 <#localName_with_leading_digit> rdf:type rdft:TestTurtleEval ;
    mf:name      "localName_with_leading_digit" ;
    rdfs:comment "localName with leading digit (p:_)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <localName_with_leading_digit.trig> ;
    mf:result    <localName_with_leading_digit.nq> ;
    .
@@ -517,7 +519,7 @@
 <#localName_with_non_leading_extras> rdf:type rdft:TestTurtleEval ;
    mf:name      "localName_with_non_leading_extras" ;
    rdfs:comment "localName with_non_leading_extras (_:a·̀ͯ‿.⁀)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <localName_with_non_leading_extras.trig> ;
    mf:result    <localName_with_non_leading_extras.nq> ;
    .
@@ -525,7 +527,7 @@
 <#old_style_base> rdf:type rdft:TestTurtleEval ;
    mf:name      "old_style_base" ;
    rdfs:comment "old-style base" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <old_style_base.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -533,7 +535,7 @@
 <#SPARQL_style_base> rdf:type rdft:TestTurtleEval ;
    mf:name      "SPARQL_style_base" ;
    rdfs:comment "SPARQL-style base" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <SPARQL_style_base.trig> ;
    mf:result    <IRI_spo.nq> ;
    .
@@ -541,7 +543,7 @@
 <#labeled_blank_node_subject> rdf:type rdft:TestTurtleEval ;
    mf:name      "labeled_blank_node_subject" ;
    rdfs:comment "labeled blank node subject" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <labeled_blank_node_subject.trig> ;
    mf:result    <labeled_blank_node_subject.nq> ;
    .
@@ -549,15 +551,23 @@
 <#labeled_blank_node_object> rdf:type rdft:TestTurtleEval ;
    mf:name      "labeled_blank_node_object" ;
    rdfs:comment "labeled blank node object" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <labeled_blank_node_object.trig> ;
    mf:result    <labeled_blank_node_object.nq> ;
    .
 
+<#labeled_blank_node_graph> rdf:type rdft:TestTurtleEval ;
+   mf:name      "labeled_blank_node_graph" ;
+   rdfs:comment "labeled blank node graph" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <labeled_blank_node_graph.trig> ;
+   mf:result    <labeled_blank_node_graph.nq> ;
+   .
+
 <#labeled_blank_node_with_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTurtleEval ;
    mf:name      "labeled_blank_node_with_PN_CHARS_BASE_character_boundaries" ;
    rdfs:comment "labeled blank node with PN_CHARS_BASE character boundaries (_:AZazÀÖØöø...)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig> ;
    mf:result    <labeled_blank_node_object.nq> ;
    .
@@ -565,7 +575,7 @@
 <#labeled_blank_node_with_leading_underscore> rdf:type rdft:TestTurtleEval ;
    mf:name      "labeled_blank_node_with_leading_underscore" ;
    rdfs:comment "labeled blank node with_leading_underscore (_:_)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <labeled_blank_node_with_leading_underscore.trig> ;
    mf:result    <labeled_blank_node_object.nq> ;
    .
@@ -573,7 +583,7 @@
 <#labeled_blank_node_with_leading_digit> rdf:type rdft:TestTurtleEval ;
    mf:name      "labeled_blank_node_with_leading_digit" ;
    rdfs:comment "labeled blank node with_leading_digit (_:0)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <labeled_blank_node_with_leading_digit.trig> ;
    mf:result    <labeled_blank_node_object.nq> ;
    .
@@ -581,7 +591,7 @@
 <#labeled_blank_node_with_non_leading_extras> rdf:type rdft:TestTurtleEval ;
    mf:name      "labeled_blank_node_with_non_leading_extras" ;
    rdfs:comment "labeled blank node with_non_leading_extras (_:a·̀ͯ‿.⁀)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <labeled_blank_node_with_non_leading_extras.trig> ;
    mf:result    <labeled_blank_node_object.nq> ;
    .
@@ -589,31 +599,39 @@
 <#anonymous_blank_node_subject> rdf:type rdft:TestTurtleEval ;
    mf:name      "anonymous_blank_node_subject" ;
    rdfs:comment "anonymous blank node subject" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <anonymous_blank_node_subject.trig> ;
-   mf:result    <labeled_blank_node_subject.nq> ;
+   mf:result    <anonymous_blank_node_subject.nq> ;
    .
 
 <#anonymous_blank_node_object> rdf:type rdft:TestTurtleEval ;
    mf:name      "anonymous_blank_node_object" ;
    rdfs:comment "anonymous blank node object" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <anonymous_blank_node_object.trig> ;
-   mf:result    <labeled_blank_node_object.nq> ;
+   mf:result    <anonymous_blank_node_object.nq> ;
+   .
+
+<#anonymous_blank_node_graph> rdf:type rdft:TestTurtleEval ;
+   mf:name      "anonymous_blank_node_graph" ;
+   rdfs:comment "anonymous blank node graph" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <anonymous_blank_node_graph.trig> ;
+   mf:result    <labeled_blank_node_graph.nq> ;
    .
 
 <#sole_blankNodePropertyList> rdf:type rdft:TestTurtleEval ;
    mf:name      "sole_blankNodePropertyList" ;
    rdfs:comment "sole blankNodePropertyList [ <p> <o> ] ." ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <sole_blankNodePropertyList.trig> ;
-   mf:result    <labeled_blank_node_subject.nq> ;
+   mf:result    <anonymous_blank_node_subject.nq> ;
    .
 
 <#blankNodePropertyList_as_subject> rdf:type rdft:TestTurtleEval ;
    mf:name      "blankNodePropertyList_as_subject" ;
    rdfs:comment "blankNodePropertyList as subject [ … ] <p> <o> ." ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <blankNodePropertyList_as_subject.trig> ;
    mf:result    <blankNodePropertyList_as_subject.nq> ;
    .
@@ -621,7 +639,7 @@
 <#blankNodePropertyList_as_object> rdf:type rdft:TestTurtleEval ;
    mf:name      "blankNodePropertyList_as_object" ;
    rdfs:comment "blankNodePropertyList as object <s> <p> [ … ] ." ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <blankNodePropertyList_as_object.trig> ;
    mf:result    <blankNodePropertyList_as_object.nq> ;
    .
@@ -629,7 +647,7 @@
 <#blankNodePropertyList_with_multiple_triples> rdf:type rdft:TestTurtleEval ;
    mf:name      "blankNodePropertyList_with_multiple_triples" ;
    rdfs:comment "blankNodePropertyList with multiple triples [ <s> <p> ; <s2> <p2> ]" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <blankNodePropertyList_with_multiple_triples.trig> ;
    mf:result    <blankNodePropertyList_with_multiple_triples.nq> ;
    .
@@ -637,7 +655,7 @@
 <#nested_blankNodePropertyLists> rdf:type rdft:TestTurtleEval ;
    mf:name      "nested_blankNodePropertyLists" ;
    rdfs:comment "nested blankNodePropertyLists [ <p1> [ <p2> <o2> ] ; <p3> <o3> ]" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <nested_blankNodePropertyLists.trig> ;
    mf:result    <nested_blankNodePropertyLists.nq> ;
    .
@@ -645,7 +663,7 @@
 <#blankNodePropertyList_containing_collection> rdf:type rdft:TestTurtleEval ;
    mf:name      "blankNodePropertyList_containing_collection" ;
    rdfs:comment "blankNodePropertyList containing collection [ <p1> ( … ) ]" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <blankNodePropertyList_containing_collection.trig> ;
    mf:result    <blankNodePropertyList_containing_collection.nq> ;
    .
@@ -653,7 +671,7 @@
 <#collection_subject> rdf:type rdft:TestTurtleEval ;
    mf:name      "collection_subject" ;
    rdfs:comment "collection subject" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <collection_subject.trig> ;
    mf:result    <collection_subject.nq> ;
    .
@@ -661,7 +679,7 @@
 <#collection_object> rdf:type rdft:TestTurtleEval ;
    mf:name      "collection_object" ;
    rdfs:comment "collection object" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <collection_object.trig> ;
    mf:result    <collection_object.nq> ;
    .
@@ -669,7 +687,7 @@
 <#empty_collection> rdf:type rdft:TestTurtleEval ;
    mf:name      "empty_collection" ;
    rdfs:comment "empty collection ()" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <empty_collection.trig> ;
    mf:result    <empty_collection.nq> ;
    .
@@ -677,7 +695,7 @@
 <#nested_collection> rdf:type rdft:TestTurtleEval ;
    mf:name      "nested_collection" ;
    rdfs:comment "nested collection (())" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <nested_collection.trig> ;
    mf:result    <nested_collection.nq> ;
    .
@@ -685,7 +703,7 @@
 <#first> rdf:type rdft:TestTurtleEval ;
    mf:name      "first" ;
    rdfs:comment "first, not last, non-empty nested collection" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <first.trig> ;
    mf:result    <first.nq> ;
    .
@@ -693,7 +711,7 @@
 <#last> rdf:type rdft:TestTurtleEval ;
    mf:name      "last" ;
    rdfs:comment "last, not first, non-empty nested collection" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <last.trig> ;
    mf:result    <last.nq> ;
    .
@@ -701,7 +719,7 @@
 <#LITERAL1> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL1" ;
    rdfs:comment "LITERAL1 'x'" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL1.trig> ;
    mf:result    <LITERAL1.nq> ;
    .
@@ -709,7 +727,7 @@
 <#LITERAL1_ascii_boundaries> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL1_ascii_boundaries" ;
    rdfs:comment "LITERAL1_ascii_boundaries '\\x00\\x09\\x0b\\x0c\\x0e\\x26\\x28...'" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL1_ascii_boundaries.trig> ;
    mf:result    <LITERAL1_ascii_boundaries.nq> ;
    .
@@ -717,7 +735,7 @@
 <#LITERAL1_all_controls> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL1_all_controls" ;
    rdfs:comment "LITERAL1_all_controls '\\x00\\x01\\x02\\x03\\x04...'" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL1_all_controls.trig> ;
    mf:result    <LITERAL1_all_controls.nq> ;
    .
@@ -725,7 +743,7 @@
 <#LITERAL1_all_punctuation> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL1_all_punctuation" ;
    rdfs:comment "LITERAL1_all_punctuation '!\"#$%&()...'" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL1_all_punctuation.trig> ;
    mf:result    <LITERAL1_all_punctuation.nq> ;
    .
@@ -733,7 +751,7 @@
 <#LITERAL_LONG1> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL_LONG1" ;
    rdfs:comment "LITERAL_LONG1 '''x'''" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL_LONG1.trig> ;
    mf:result    <LITERAL1.nq> ;
    .
@@ -741,7 +759,7 @@
 <#LITERAL_LONG1_ascii_boundaries> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL_LONG1_ascii_boundaries" ;
    rdfs:comment "LITERAL_LONG1_ascii_boundaries '\\x00\\x26\\x28...'" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL_LONG1_ascii_boundaries.trig> ;
    mf:result    <LITERAL_LONG1_ascii_boundaries.nq> ;
    .
@@ -749,7 +767,7 @@
 <#LITERAL_LONG1_with_1_squote> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL_LONG1_with_1_squote" ;
    rdfs:comment "LITERAL_LONG1 with 1 squote '''a'b'''" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL_LONG1_with_1_squote.trig> ;
    mf:result    <LITERAL_LONG1_with_1_squote.nq> ;
    .
@@ -757,7 +775,7 @@
 <#LITERAL_LONG1_with_2_squotes> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL_LONG1_with_2_squotes" ;
    rdfs:comment "LITERAL_LONG1 with 2 squotes '''a''b'''" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL_LONG1_with_2_squotes.trig> ;
    mf:result    <LITERAL_LONG1_with_2_squotes.nq> ;
    .
@@ -765,7 +783,7 @@
 <#LITERAL2> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL2" ;
    rdfs:comment "LITERAL2 \"x\"" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL2.trig> ;
    mf:result    <LITERAL1.nq> ;
    .
@@ -773,7 +791,7 @@
 <#LITERAL2_ascii_boundaries> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL2_ascii_boundaries" ;
    rdfs:comment "LITERAL2_ascii_boundaries '\\x00\\x09\\x0b\\x0c\\x0e\\x21\\x23...'" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL2_ascii_boundaries.trig> ;
    mf:result    <LITERAL2_ascii_boundaries.nq> ;
    .
@@ -781,7 +799,7 @@
 <#LITERAL_LONG2> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL_LONG2" ;
    rdfs:comment "LITERAL_LONG2 \"\"\"x\"\"\"" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL_LONG2.trig> ;
    mf:result    <LITERAL1.nq> ;
    .
@@ -789,7 +807,7 @@
 <#LITERAL_LONG2_ascii_boundaries> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL_LONG2_ascii_boundaries" ;
    rdfs:comment "LITERAL_LONG2_ascii_boundaries '\\x00\\x21\\x23...'" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL_LONG2_ascii_boundaries.trig> ;
    mf:result    <LITERAL_LONG2_ascii_boundaries.nq> ;
    .
@@ -797,7 +815,7 @@
 <#LITERAL_LONG2_with_1_squote> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL_LONG2_with_1_squote" ;
    rdfs:comment "LITERAL_LONG2 with 1 squote \"\"\"a\"b\"\"\"" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL_LONG2_with_1_squote.trig> ;
    mf:result    <LITERAL_LONG2_with_1_squote.nq> ;
    .
@@ -805,7 +823,7 @@
 <#LITERAL_LONG2_with_2_squotes> rdf:type rdft:TestTurtleEval ;
    mf:name      "LITERAL_LONG2_with_2_squotes" ;
    rdfs:comment "LITERAL_LONG2 with 2 squotes \"\"\"a\"\"b\"\"\"" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL_LONG2_with_2_squotes.trig> ;
    mf:result    <LITERAL_LONG2_with_2_squotes.nq> ;
    .
@@ -813,7 +831,7 @@
 <#literal_with_CHARACTER_TABULATION> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_CHARACTER_TABULATION" ;
    rdfs:comment "literal with CHARACTER TABULATION" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_CHARACTER_TABULATION.trig> ;
    mf:result    <literal_with_CHARACTER_TABULATION.nq> ;
    .
@@ -821,7 +839,7 @@
 <#literal_with_BACKSPACE> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_BACKSPACE" ;
    rdfs:comment "literal with BACKSPACE" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_BACKSPACE.trig> ;
    mf:result    <literal_with_BACKSPACE.nq> ;
    .
@@ -829,7 +847,7 @@
 <#literal_with_LINE_FEED> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_LINE_FEED" ;
    rdfs:comment "literal with LINE FEED" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_LINE_FEED.trig> ;
    mf:result    <literal_with_LINE_FEED.nq> ;
    .
@@ -837,7 +855,7 @@
 <#literal_with_CARRIAGE_RETURN> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_CARRIAGE_RETURN" ;
    rdfs:comment "literal with CARRIAGE RETURN" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_CARRIAGE_RETURN.trig> ;
    mf:result    <literal_with_CARRIAGE_RETURN.nq> ;
    .
@@ -845,7 +863,7 @@
 <#literal_with_FORM_FEED> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_FORM_FEED" ;
    rdfs:comment "literal with FORM FEED" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_FORM_FEED.trig> ;
    mf:result    <literal_with_FORM_FEED.nq> ;
    .
@@ -853,7 +871,7 @@
 <#literal_with_REVERSE_SOLIDUS> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_REVERSE_SOLIDUS" ;
    rdfs:comment "literal with REVERSE SOLIDUS" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_REVERSE_SOLIDUS.trig> ;
    mf:result    <literal_with_REVERSE_SOLIDUS.nq> ;
    .
@@ -861,7 +879,7 @@
 <#literal_with_escaped_CHARACTER_TABULATION> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_escaped_CHARACTER_TABULATION" ;
    rdfs:comment "literal with escaped CHARACTER TABULATION" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_escaped_CHARACTER_TABULATION.trig> ;
    mf:result    <literal_with_CHARACTER_TABULATION.nq> ;
    .
@@ -869,7 +887,7 @@
 <#literal_with_escaped_BACKSPACE> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_escaped_BACKSPACE" ;
    rdfs:comment "literal with escaped BACKSPACE" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_escaped_BACKSPACE.trig> ;
    mf:result    <literal_with_BACKSPACE.nq> ;
    .
@@ -877,7 +895,7 @@
 <#literal_with_escaped_LINE_FEED> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_escaped_LINE_FEED" ;
    rdfs:comment "literal with escaped LINE FEED" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_escaped_LINE_FEED.trig> ;
    mf:result    <literal_with_LINE_FEED.nq> ;
    .
@@ -885,7 +903,7 @@
 <#literal_with_escaped_CARRIAGE_RETURN> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_escaped_CARRIAGE_RETURN" ;
    rdfs:comment "literal with escaped CARRIAGE RETURN" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_escaped_CARRIAGE_RETURN.trig> ;
    mf:result    <literal_with_CARRIAGE_RETURN.nq> ;
    .
@@ -893,7 +911,7 @@
 <#literal_with_escaped_FORM_FEED> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_escaped_FORM_FEED" ;
    rdfs:comment "literal with escaped FORM FEED" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_escaped_FORM_FEED.trig> ;
    mf:result    <literal_with_FORM_FEED.nq> ;
    .
@@ -901,7 +919,7 @@
 <#literal_with_numeric_escape4> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_numeric_escape4" ;
    rdfs:comment "literal with numeric escape4 \\u" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_numeric_escape4.trig> ;
    mf:result    <literal_with_numeric_escape4.nq> ;
    .
@@ -909,7 +927,7 @@
 <#literal_with_numeric_escape8> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_with_numeric_escape8" ;
    rdfs:comment "literal with numeric escape8 \\U" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_with_numeric_escape8.trig> ;
    mf:result    <literal_with_numeric_escape4.nq> ;
    .
@@ -917,7 +935,7 @@
 <#IRIREF_datatype> rdf:type rdft:TestTurtleEval ;
    mf:name      "IRIREF_datatype" ;
    rdfs:comment "IRIREF datatype \"\"^^<t>" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <IRIREF_datatype.trig> ;
    mf:result    <IRIREF_datatype.nq> ;
    .
@@ -925,7 +943,7 @@
 <#prefixed_name_datatype> rdf:type rdft:TestTurtleEval ;
    mf:name      "prefixed_name_datatype" ;
    rdfs:comment "prefixed name datatype \"\"^^p:t" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <prefixed_name_datatype.trig> ;
    mf:result    <IRIREF_datatype.nq> ;
    .
@@ -933,7 +951,7 @@
 <#bareword_integer> rdf:type rdft:TestTurtleEval ;
    mf:name      "bareword_integer" ;
    rdfs:comment "bareword integer" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <bareword_integer.trig> ;
    mf:result    <IRIREF_datatype.nq> ;
    .
@@ -941,7 +959,7 @@
 <#bareword_decimal> rdf:type rdft:TestTurtleEval ;
    mf:name      "bareword_decimal" ;
    rdfs:comment "bareword decimal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <bareword_decimal.trig> ;
    mf:result    <bareword_decimal.nq> ;
    .
@@ -949,7 +967,7 @@
 <#bareword_double> rdf:type rdft:TestTurtleEval ;
    mf:name      "bareword_double" ;
    rdfs:comment "bareword double" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <bareword_double.trig> ;
    mf:result    <bareword_double.nq> ;
    .
@@ -957,7 +975,7 @@
 <#double_lower_case_e> rdf:type rdft:TestTurtleEval ;
    mf:name      "double_lower_case_e" ;
    rdfs:comment "double lower case e" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <double_lower_case_e.trig> ;
    mf:result    <double_lower_case_e.nq> ;
    .
@@ -965,7 +983,7 @@
 <#negative_numeric> rdf:type rdft:TestTurtleEval ;
    mf:name      "negative_numeric" ;
    rdfs:comment "negative numeric" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <negative_numeric.trig> ;
    mf:result    <negative_numeric.nq> ;
    .
@@ -973,7 +991,7 @@
 <#positive_numeric> rdf:type rdft:TestTurtleEval ;
    mf:name      "positive_numeric" ;
    rdfs:comment "positive numeric" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <positive_numeric.trig> ;
    mf:result    <positive_numeric.nq> ;
    .
@@ -981,7 +999,7 @@
 <#numeric_with_leading_0> rdf:type rdft:TestTurtleEval ;
    mf:name      "numeric_with_leading_0" ;
    rdfs:comment "numeric with leading 0" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <numeric_with_leading_0.trig> ;
    mf:result    <numeric_with_leading_0.nq> ;
    .
@@ -989,7 +1007,7 @@
 <#literal_true> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_true" ;
    rdfs:comment "literal true" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_true.trig> ;
    mf:result    <literal_true.nq> ;
    .
@@ -997,7 +1015,7 @@
 <#literal_false> rdf:type rdft:TestTurtleEval ;
    mf:name      "literal_false" ;
    rdfs:comment "literal false" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <literal_false.trig> ;
    mf:result    <literal_false.nq> ;
    .
@@ -1005,7 +1023,7 @@
 <#langtagged_non_LONG> rdf:type rdft:TestTurtleEval ;
    mf:name      "langtagged_non_LONG" ;
    rdfs:comment "langtagged non-LONG \"x\"@en" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <langtagged_non_LONG.trig> ;
    mf:result    <langtagged_non_LONG.nq> ;
    .
@@ -1013,7 +1031,7 @@
 <#langtagged_LONG> rdf:type rdft:TestTurtleEval ;
    mf:name      "langtagged_LONG" ;
    rdfs:comment "langtagged LONG \"\"\"x\"\"\"@en" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <langtagged_LONG.trig> ;
    mf:result    <langtagged_non_LONG.nq> ;
    .
@@ -1021,7 +1039,7 @@
 <#lantag_with_subtag> rdf:type rdft:TestTurtleEval ;
    mf:name      "lantag_with_subtag" ;
    rdfs:comment "lantag with subtag \"x\"@en-us" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <lantag_with_subtag.trig> ;
    mf:result    <lantag_with_subtag.nq> ;
    .
@@ -1029,7 +1047,7 @@
 <#objectList_with_two_objects> rdf:type rdft:TestTurtleEval ;
    mf:name      "objectList_with_two_objects" ;
    rdfs:comment "objectList with two objects … <o1>,<o2>" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <objectList_with_two_objects.trig> ;
    mf:result    <objectList_with_two_objects.nq> ;
    .
@@ -1037,7 +1055,7 @@
 <#predicateObjectList_with_two_objectLists> rdf:type rdft:TestTurtleEval ;
    mf:name      "predicateObjectList_with_two_objectLists" ;
    rdfs:comment "predicateObjectList with two objectLists … <o1>,<o2>" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <predicateObjectList_with_two_objectLists.trig> ;
    mf:result    <predicateObjectList_with_two_objectLists.nq> ;
    .
@@ -1045,7 +1063,7 @@
 <#repeated_semis_at_end> rdf:type rdft:TestTurtleEval ;
    mf:name      "repeated_semis_at_end" ;
    rdfs:comment "repeated semis at end <s> <p> <o> ;; <p2> <o2> ." ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <repeated_semis_at_end.trig> ;
    mf:result    <predicateObjectList_with_two_objectLists.nq> ;
    .
@@ -1053,7 +1071,7 @@
 <#repeated_semis_not_at_end> rdf:type rdft:TestTurtleEval ;
    mf:name      "repeated_semis_not_at_end" ;
    rdfs:comment "repeated semis not at end <s> <p> <o> ;;." ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <repeated_semis_not_at_end.trig> ;
    mf:result    <repeated_semis_not_at_end.nq> ;
    .
@@ -1062,987 +1080,987 @@
 <#trig-syntax-file-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-file-01" ;
    rdfs:comment "Empty file" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-file-01.trig> ;
    .
 
 <#trig-syntax-file-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-file-02" ;
    rdfs:comment "Only comment" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-file-02.trig> ;
    .
 
 <#trig-syntax-file-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-file-03" ;
    rdfs:comment "One comment, one empty line" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-file-03.trig> ;
    .
 
 <#trig-syntax-uri-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-uri-01" ;
    rdfs:comment "Only IRIs" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-uri-01.trig> ;
    .
 
 <#trig-syntax-uri-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-uri-02" ;
    rdfs:comment "IRIs with Unicode escape" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-uri-02.trig> ;
    .
 
 <#trig-syntax-uri-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-uri-03" ;
    rdfs:comment "IRIs with long Unicode escape" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-uri-03.trig> ;
    .
 
 <#trig-syntax-uri-04> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-uri-04" ;
    rdfs:comment "Legal IRIs" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-uri-04.trig> ;
    .
 
 <#trig-syntax-base-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-base-01" ;
    rdfs:comment "@base" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-base-01.trig> ;
    .
 
 <#trig-syntax-base-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-base-02" ;
    rdfs:comment "BASE" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-base-02.trig> ;
    .
 
 <#trig-syntax-base-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-base-03" ;
    rdfs:comment "@base with relative IRIs" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-base-03.trig> ;
    .
 
 <#trig-syntax-base-04> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-base-04" ;
    rdfs:comment "base with relative IRIs" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-base-04.trig> ;
    .
 
 <#trig-syntax-prefix-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-prefix-01" ;
    rdfs:comment "@prefix" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-01.trig> ;
    .
 
 <#trig-syntax-prefix-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-prefix-02" ;
    rdfs:comment "PreFIX" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-02.trig> ;
    .
 
 <#trig-syntax-prefix-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-prefix-03" ;
    rdfs:comment "Empty PREFIX" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-03.trig> ;
    .
 
 <#trig-syntax-prefix-04> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-prefix-04" ;
    rdfs:comment "Empty @prefix with % escape" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-04.trig> ;
    .
 
 <#trig-syntax-prefix-05> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-prefix-05" ;
    rdfs:comment "@prefix with no suffix" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-05.trig> ;
    .
 
 <#trig-syntax-prefix-06> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-prefix-06" ;
    rdfs:comment "colon is a legal pname character" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-06.trig> ;
    .
 
 <#trig-syntax-prefix-07> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-prefix-07" ;
    rdfs:comment "dash is a legal pname character" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-07.trig> ;
    .
 
 <#trig-syntax-prefix-08> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-prefix-08" ;
    rdfs:comment "underscore is a legal pname character" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-08.trig> ;
    .
 
 <#trig-syntax-prefix-09> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-prefix-09" ;
    rdfs:comment "percents in pnames" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-09.trig> ;
    .
 
 <#trig-syntax-string-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-string-01" ;
    rdfs:comment "string literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-01.trig> ;
    .
 
 <#trig-syntax-string-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-string-02" ;
    rdfs:comment "langString literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-02.trig> ;
    .
 
 <#trig-syntax-string-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-string-03" ;
    rdfs:comment "langString literal with region" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-03.trig> ;
    .
 
 <#trig-syntax-string-04> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-string-04" ;
    rdfs:comment "squote string literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-04.trig> ;
    .
 
 <#trig-syntax-string-05> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-string-05" ;
    rdfs:comment "squote langString literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-05.trig> ;
    .
 
 <#trig-syntax-string-06> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-string-06" ;
    rdfs:comment "squote langString literal with region" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-06.trig> ;
    .
 
 <#trig-syntax-string-07> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-string-07" ;
    rdfs:comment "long string literal with embedded single- and double-quotes" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-07.trig> ;
    .
 
 <#trig-syntax-string-08> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-string-08" ;
    rdfs:comment "long string literal with embedded newline" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-08.trig> ;
    .
 
 <#trig-syntax-string-09> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-string-09" ;
    rdfs:comment "squote long string literal with embedded single- and double-quotes" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-09.trig> ;
    .
 
 <#trig-syntax-string-10> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-string-10" ;
    rdfs:comment "long langString literal with embedded newline" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-10.trig> ;
    .
 
 <#trig-syntax-string-11> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-string-11" ;
    rdfs:comment "squote long langString literal with embedded newline" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-11.trig> ;
    .
 
 <#trig-syntax-str-esc-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-str-esc-01" ;
    rdfs:comment "string literal with escaped newline" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-str-esc-01.trig> ;
    .
 
 <#trig-syntax-str-esc-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-str-esc-02" ;
    rdfs:comment "string literal with Unicode escape" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-str-esc-02.trig> ;
    .
 
 <#trig-syntax-str-esc-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-str-esc-03" ;
    rdfs:comment "string literal with long Unicode escape" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-str-esc-03.trig> ;
    .
 
 <#trig-syntax-pname-esc-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-pname-esc-01" ;
    rdfs:comment "pname with back-slash escapes" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-pname-esc-01.trig> ;
    .
 
 <#trig-syntax-pname-esc-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-pname-esc-02" ;
    rdfs:comment "pname with back-slash escapes (2)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-pname-esc-02.trig> ;
    .
 
 <#trig-syntax-pname-esc-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-pname-esc-03" ;
    rdfs:comment "pname with back-slash escapes (3)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-pname-esc-03.trig> ;
    .
 
 <#trig-syntax-bnode-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-bnode-01" ;
    rdfs:comment "bnode subject" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-01.trig> ;
    .
 
 <#trig-syntax-bnode-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-bnode-02" ;
    rdfs:comment "bnode object" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-02.trig> ;
    .
 
 <#trig-syntax-bnode-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-bnode-03" ;
    rdfs:comment "bnode property list object" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-03.trig> ;
    .
 
 <#trig-syntax-bnode-04> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-bnode-04" ;
    rdfs:comment "bnode property list object (2)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-04.trig> ;
    .
 
 <#trig-syntax-bnode-05> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-bnode-05" ;
    rdfs:comment "bnode property list subject" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-05.trig> ;
    .
 
 <#trig-syntax-bnode-06> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-bnode-06" ;
    rdfs:comment "labeled bnode subject" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-06.trig> ;
    .
 
 <#trig-syntax-bnode-07> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-bnode-07" ;
    rdfs:comment "labeled bnode subject and object" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-07.trig> ;
    .
 
 <#trig-syntax-bnode-08> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-bnode-08" ;
    rdfs:comment "bare bnode property list" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-08.trig> ;
    .
 
 <#trig-syntax-bnode-09> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-bnode-09" ;
    rdfs:comment "bnode property list" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-09.trig> ;
    .
 
 <#trig-syntax-bnode-10> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-bnode-10" ;
    rdfs:comment "mixed bnode property list and triple" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-10.trig> ;
    .
 
 <#trig-syntax-number-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-number-01" ;
    rdfs:comment "integer literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-01.trig> ;
    .
 
 <#trig-syntax-number-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-number-02" ;
    rdfs:comment "negative integer literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-02.trig> ;
    .
 
 <#trig-syntax-number-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-number-03" ;
    rdfs:comment "positive integer literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-03.trig> ;
    .
 
 <#trig-syntax-number-04> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-number-04" ;
    rdfs:comment "decimal literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-04.trig> ;
    .
 
 <#trig-syntax-number-05> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-number-05" ;
    rdfs:comment "decimal literal (no leading digits)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-05.trig> ;
    .
 
 <#trig-syntax-number-06> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-number-06" ;
    rdfs:comment "negative decimal literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-06.trig> ;
    .
 
 <#trig-syntax-number-07> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-number-07" ;
    rdfs:comment "positive decimal literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-07.trig> ;
    .
 
 <#trig-syntax-number-08> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-number-08" ;
    rdfs:comment "integer literal with decimal lexical confusion" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-08.trig> ;
    .
 
 <#trig-syntax-number-09> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-number-09" ;
    rdfs:comment "double literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-09.trig> ;
    .
 
 <#trig-syntax-number-10> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-number-10" ;
    rdfs:comment "negative double literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-10.trig> ;
    .
 
 <#trig-syntax-number-11> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-number-11" ;
    rdfs:comment "double literal no fraction" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-11.trig> ;
    .
 
 <#trig-syntax-datatypes-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-datatypes-01" ;
    rdfs:comment "xsd:byte literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-datatypes-01.trig> ;
    .
 
 <#trig-syntax-datatypes-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-datatypes-02" ;
    rdfs:comment "integer as xsd:string" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-datatypes-02.trig> ;
    .
 
 <#trig-syntax-kw-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-kw-01" ;
    rdfs:comment "boolean literal (true)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-kw-01.trig> ;
    .
 
 <#trig-syntax-kw-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-kw-02" ;
    rdfs:comment "boolean literal (false)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-kw-02.trig> ;
    .
 
 <#trig-syntax-kw-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-kw-03" ;
    rdfs:comment "'a' as keyword" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-kw-03.trig> ;
    .
 
 <#trig-syntax-struct-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-struct-01" ;
    rdfs:comment "object list" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-struct-01.trig> ;
    .
 
 <#trig-syntax-struct-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-struct-02" ;
    rdfs:comment "predicate list with object list" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-struct-02.trig> ;
    .
 
 <#trig-syntax-struct-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-struct-03" ;
    rdfs:comment "predicate list with object list and dangling ';'" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-struct-03.trig> ;
    .
 
 <#trig-syntax-struct-04> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-struct-04" ;
    rdfs:comment "predicate list with multiple ;;" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-struct-04.trig> ;
    .
 
 <#trig-syntax-struct-05> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-struct-05" ;
    rdfs:comment "predicate list with multiple ;;" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-struct-05.trig> ;
    .
 
 <#trig-syntax-lists-01> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-lists-01" ;
    rdfs:comment "empty list" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-lists-01.trig> ;
    .
 
 <#trig-syntax-lists-02> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-lists-02" ;
    rdfs:comment "mixed list" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-lists-02.trig> ;
    .
 
 <#trig-syntax-lists-03> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-lists-03" ;
    rdfs:comment "isomorphic list as subject and object" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-lists-03.trig> ;
    .
 
 <#trig-syntax-lists-04> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-lists-04" ;
    rdfs:comment "lists of lists" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-lists-04.trig> ;
    .
 
 <#trig-syntax-lists-05> rdf:type rdft:TestTurtlePositiveSyntax ;
    mf:name    "trig-syntax-lists-05" ;
    rdfs:comment "mixed lists with embedded lists" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-lists-05.trig> ;
    .
 
 <#trig-syntax-bad-uri-01> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-uri-01" ;
    rdfs:comment "Bad IRI : space (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-uri-01.trig> ;
    .
 
 <#trig-syntax-bad-uri-02> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-uri-02" ;
    rdfs:comment "Bad IRI : bad escape (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-uri-02.trig> ;
    .
 
 <#trig-syntax-bad-uri-03> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-uri-03" ;
    rdfs:comment "Bad IRI : bad long escape (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-uri-03.trig> ;
    .
 
 <#trig-syntax-bad-uri-04> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-uri-04" ;
    rdfs:comment "Bad IRI : character escapes not allowed (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-uri-04.trig> ;
    .
 
 <#trig-syntax-bad-uri-05> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-uri-05" ;
    rdfs:comment "Bad IRI : character escapes not allowed (2) (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-uri-05.trig> ;
    .
 
 <#trig-syntax-bad-prefix-01> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-01" ;
    rdfs:comment "No prefix (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-prefix-01.trig> ;
    .
 
 <#trig-syntax-bad-prefix-02> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-02" ;
    rdfs:comment "No prefix (2) (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-prefix-02.trig> ;
    .
 
 <#trig-syntax-bad-prefix-03> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-03" ;
    rdfs:comment "@prefix without URI (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-prefix-03.trig> ;
    .
 
 <#trig-syntax-bad-prefix-04> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-04" ;
    rdfs:comment "@prefix without prefix name (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-prefix-04.trig> ;
    .
 
 <#trig-syntax-bad-prefix-05> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-05" ;
    rdfs:comment "@prefix without ':' (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-prefix-05.trig> ;
    .
 
 <#trig-syntax-bad-base-01> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-base-01" ;
    rdfs:comment "@base without URI (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-base-01.trig> ;
    .
 
 <#trig-syntax-bad-base-02> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-base-02" ;
    rdfs:comment "@base in wrong case (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-base-02.trig> ;
    .
 
 <#trig-syntax-bad-base-03> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-base-03" ;
    rdfs:comment "BASE without URI (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-base-03.trig> ;
    .
 
 <#trig-syntax-bad-struct-02> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-02" ;
    rdfs:comment "Turtle is not N3 (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-02.trig> ;
    .
 
 <#trig-syntax-bad-struct-03> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-03" ;
    rdfs:comment "Turtle is not NQuads (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-03.trig> ;
    .
 
 <#trig-syntax-bad-struct-04> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-04" ;
    rdfs:comment "Turtle does not allow literals-as-subjects (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-04.trig> ;
    .
 
 <#trig-syntax-bad-struct-05> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-05" ;
    rdfs:comment "Turtle does not allow literals-as-predicates (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-05.trig> ;
    .
 
 <#trig-syntax-bad-struct-06> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-06" ;
    rdfs:comment "Turtle does not allow bnodes-as-predicates (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-06.trig> ;
    .
 
 <#trig-syntax-bad-struct-07> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-07" ;
    rdfs:comment "Turtle does not allow labeled bnodes-as-predicates (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-07.trig> ;
    .
 
 <#trig-syntax-bad-kw-01> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-kw-01" ;
    rdfs:comment "'A' is not a keyword (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-kw-01.trig> ;
    .
 
 <#trig-syntax-bad-kw-02> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-kw-02" ;
    rdfs:comment "'a' cannot be used as subject (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-kw-02.trig> ;
    .
 
 <#trig-syntax-bad-kw-03> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-kw-03" ;
    rdfs:comment "'a' cannot be used as object (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-kw-03.trig> ;
    .
 
 <#trig-syntax-bad-kw-04> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-kw-04" ;
    rdfs:comment "'true' cannot be used as subject (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-kw-04.trig> ;
    .
 
 <#trig-syntax-bad-kw-05> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-kw-05" ;
    rdfs:comment "'true' cannot be used as object (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-kw-05.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-01> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-01" ;
    rdfs:comment "{} fomulae not in Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-01.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-02> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-02" ;
    rdfs:comment "= is not Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-02.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-03> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-03" ;
    rdfs:comment "N3 paths not in Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-03.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-04> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-04" ;
    rdfs:comment "N3 paths not in Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-04.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-05> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-05" ;
    rdfs:comment "N3 is...of not in Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-05.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-06> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-06" ;
    rdfs:comment "N3 paths not in Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-06.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-07> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-07" ;
    rdfs:comment "@keywords is not Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-07.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-08> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-08" ;
    rdfs:comment "@keywords is not Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-08.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-09> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-09" ;
    rdfs:comment "=> is not Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-09.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-10> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-10" ;
    rdfs:comment "<= is not Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-10.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-11> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-11" ;
    rdfs:comment "@forSome is not Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-11.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-12> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-12" ;
    rdfs:comment "@forAll is not Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-12.trig> ;
    .
 
 <#trig-syntax-bad-n3-extras-13> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-13" ;
    rdfs:comment "@keywords is not Turtle (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-13.trig> ;
    .
 
 <#trig-syntax-bad-struct-08> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-08" ;
    rdfs:comment "missing '.' (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-08.trig> ;
    .
 
 <#trig-syntax-bad-struct-09> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-09" ;
    rdfs:comment "extra '.' (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-09.trig> ;
    .
 
 <#trig-syntax-bad-struct-10> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-10" ;
    rdfs:comment "extra '.' (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-10.trig> ;
    .
 
 <#trig-syntax-bad-struct-11> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-11" ;
    rdfs:comment "trailing ';' no '.' (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-11.trig> ;
    .
 
 <#trig-syntax-bad-struct-12> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-12" ;
    rdfs:comment "subject, predicate, no object (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-12.trig> ;
    .
 
 <#trig-syntax-bad-struct-13> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-13" ;
    rdfs:comment "subject, predicate, no object (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-13.trig> ;
    .
 
 <#trig-syntax-bad-struct-14> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-14" ;
    rdfs:comment "literal as subject (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-14.trig> ;
    .
 
 <#trig-syntax-bad-struct-15> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-15" ;
    rdfs:comment "literal as predicate (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-15.trig> ;
    .
 
 <#trig-syntax-bad-struct-16> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-16" ;
    rdfs:comment "bnode as predicate (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-16.trig> ;
    .
 
 <#trig-syntax-bad-struct-17> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-17" ;
    rdfs:comment "labeled bnode as predicate (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-17.trig> ;
    .
 
 <#trig-syntax-bad-lang-01> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-lang-01" ;
    rdfs:comment "langString with bad lang (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-lang-01.trig> ;
    .
 
 <#trig-syntax-bad-esc-01> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-esc-01" ;
    rdfs:comment "Bad string escape (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-esc-01.trig> ;
    .
 
 <#trig-syntax-bad-esc-02> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-esc-02" ;
    rdfs:comment "Bad string escape (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-esc-02.trig> ;
    .
 
 <#trig-syntax-bad-esc-03> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-esc-03" ;
    rdfs:comment "Bad string escape (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-esc-03.trig> ;
    .
 
 <#trig-syntax-bad-esc-04> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-esc-04" ;
    rdfs:comment "Bad string escape (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-esc-04.trig> ;
    .
 
 <#trig-syntax-bad-pname-01> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-pname-01" ;
    rdfs:comment "'~' must be escaped in pname (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-pname-01.trig> ;
    .
 
 <#trig-syntax-bad-pname-02> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-pname-02" ;
    rdfs:comment "Bad %-sequence in pname (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-pname-02.trig> ;
    .
 
 <#trig-syntax-bad-pname-03> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-pname-03" ;
    rdfs:comment "Bad unicode escape in pname (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-pname-03.trig> ;
    .
 
 <#trig-syntax-bad-string-01> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-01" ;
    rdfs:comment "mismatching string literal open/close (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-01.trig> ;
    .
 
 <#trig-syntax-bad-string-02> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-02" ;
    rdfs:comment "mismatching string literal open/close (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-02.trig> ;
    .
 
 <#trig-syntax-bad-string-03> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-03" ;
    rdfs:comment "mismatching string literal long/short (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-03.trig> ;
    .
 
 <#trig-syntax-bad-string-04> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-04" ;
    rdfs:comment "mismatching long string literal open/close (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-04.trig> ;
    .
 
 <#trig-syntax-bad-string-05> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-05" ;
    rdfs:comment "Long literal with missing end (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-05.trig> ;
    .
 
 <#trig-syntax-bad-string-06> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-06" ;
    rdfs:comment "Long literal with extra quote (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-06.trig> ;
    .
 
 <#trig-syntax-bad-string-07> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-07" ;
    rdfs:comment "Long literal with extra squote (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-07.trig> ;
    .
 
 <#trig-syntax-bad-num-01> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-01" ;
    rdfs:comment "Bad number format (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-num-01.trig> ;
    .
 
 <#trig-syntax-bad-num-02> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-02" ;
    rdfs:comment "Bad number format (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-num-02.trig> ;
    .
 
 <#trig-syntax-bad-num-03> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-03" ;
    rdfs:comment "Bad number format (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-num-03.trig> ;
    .
 
 <#trig-syntax-bad-num-04> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-04" ;
    rdfs:comment "Bad number format (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-num-04.trig> ;
    .
 
 <#trig-syntax-bad-num-05> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-05" ;
    rdfs:comment "Bad number format (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-num-05.trig> ;
    .
 
 <#trig-eval-struct-01> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-eval-struct-01" ;
    rdfs:comment "triple with IRIs" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-eval-struct-01.trig> ;
    mf:result    <trig-eval-struct-01.nq> ;
    .
@@ -2050,7 +2068,7 @@
 <#trig-eval-struct-02> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-eval-struct-02" ;
    rdfs:comment "triple with IRIs and embedded whitespace" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-eval-struct-02.trig> ;
    mf:result    <trig-eval-struct-02.nq> ;
    .
@@ -2058,7 +2076,7 @@
 <#trig-subm-01> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-01" ;
    rdfs:comment "Blank subject" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-01.trig> ;
    mf:result    <trig-subm-01.nq> ;
    .
@@ -2066,7 +2084,7 @@
 <#trig-subm-02> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-02" ;
    rdfs:comment "@prefix and qnames" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-02.trig> ;
    mf:result    <trig-subm-02.nq> ;
    .
@@ -2074,7 +2092,7 @@
 <#trig-subm-03> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-03" ;
    rdfs:comment ", operator" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-03.trig> ;
    mf:result    <trig-subm-03.nq> ;
    .
@@ -2082,7 +2100,7 @@
 <#trig-subm-04> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-04" ;
    rdfs:comment "; operator" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-04.trig> ;
    mf:result    <trig-subm-04.nq> ;
    .
@@ -2090,7 +2108,7 @@
 <#trig-subm-05> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-05" ;
    rdfs:comment "empty [] as subject and object" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-05.trig> ;
    mf:result    <trig-subm-05.nq> ;
    .
@@ -2098,7 +2116,7 @@
 <#trig-subm-06> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-06" ;
    rdfs:comment "non-empty [] as subject and object" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-06.trig> ;
    mf:result    <trig-subm-06.nq> ;
    .
@@ -2106,7 +2124,7 @@
 <#trig-subm-07> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-07" ;
    rdfs:comment "'a' as predicate" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-07.trig> ;
    mf:result    <trig-subm-07.nq> ;
    .
@@ -2114,7 +2132,7 @@
 <#trig-subm-08> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-08" ;
    rdfs:comment "simple collection" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-08.trig> ;
    mf:result    <trig-subm-08.nq> ;
    .
@@ -2122,7 +2140,7 @@
 <#trig-subm-09> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-09" ;
    rdfs:comment "empty collection" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-09.trig> ;
    mf:result    <trig-subm-09.nq> ;
    .
@@ -2130,7 +2148,7 @@
 <#trig-subm-10> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-10" ;
    rdfs:comment "integer datatyped literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-10.trig> ;
    mf:result    <trig-subm-10.nq> ;
    .
@@ -2138,7 +2156,7 @@
 <#trig-subm-11> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-11" ;
    rdfs:comment "decimal integer canonicalization" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-11.trig> ;
    mf:result    <trig-subm-11.nq> ;
    .
@@ -2146,7 +2164,7 @@
 <#trig-subm-12> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-12" ;
    rdfs:comment "- and _ in names and qnames" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-12.trig> ;
    mf:result    <trig-subm-12.nq> ;
    .
@@ -2154,7 +2172,7 @@
 <#trig-subm-13> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-13" ;
    rdfs:comment "tests for rdf:_<numbers> and other qnames starting with _" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-13.trig> ;
    mf:result    <trig-subm-13.nq> ;
    .
@@ -2162,7 +2180,7 @@
 <#trig-subm-14> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-14" ;
    rdfs:comment "bare : allowed" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-14.trig> ;
    mf:result    <trig-subm-14.nq> ;
    .
@@ -2170,7 +2188,7 @@
 <#trig-subm-15> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-15" ;
    rdfs:comment "simple long literal" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-15.trig> ;
    mf:result    <trig-subm-15.nq> ;
    .
@@ -2178,7 +2196,7 @@
 <#trig-subm-16> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-16" ;
    rdfs:comment "long literals with escapes" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-16.trig> ;
    mf:result    <trig-subm-16.nq> ;
    .
@@ -2186,7 +2204,7 @@
 <#trig-subm-17> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-17" ;
    rdfs:comment "floating point number" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-17.trig> ;
    mf:result    <trig-subm-17.nq> ;
    .
@@ -2194,7 +2212,7 @@
 <#trig-subm-18> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-18" ;
    rdfs:comment "empty literals, normal and long variant" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-18.trig> ;
    mf:result    <trig-subm-18.nq> ;
    .
@@ -2202,7 +2220,7 @@
 <#trig-subm-19> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-19" ;
    rdfs:comment "positive integer, decimal and doubles" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-19.trig> ;
    mf:result    <trig-subm-19.nq> ;
    .
@@ -2210,7 +2228,7 @@
 <#trig-subm-20> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-20" ;
    rdfs:comment "negative integer, decimal and doubles" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-20.trig> ;
    mf:result    <trig-subm-20.nq> ;
    .
@@ -2218,7 +2236,7 @@
 <#trig-subm-21> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-21" ;
    rdfs:comment "long literal ending in double quote" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-21.trig> ;
    mf:result    <trig-subm-21.nq> ;
    .
@@ -2226,7 +2244,7 @@
 <#trig-subm-22> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-22" ;
    rdfs:comment "boolean literals" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-22.trig> ;
    mf:result    <trig-subm-22.nq> ;
    .
@@ -2234,7 +2252,7 @@
 <#trig-subm-23> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-23" ;
    rdfs:comment "comments" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-23.trig> ;
    mf:result    <trig-subm-23.nq> ;
    .
@@ -2242,7 +2260,7 @@
 <#trig-subm-24> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-24" ;
    rdfs:comment "no final mewline" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-24.trig> ;
    mf:result    <trig-subm-24.nq> ;
    .
@@ -2250,7 +2268,7 @@
 <#trig-subm-25> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-25" ;
    rdfs:comment "repeating a @prefix changes pname definition" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-25.trig> ;
    mf:result    <trig-subm-25.nq> ;
    .
@@ -2258,7 +2276,7 @@
 <#trig-subm-26> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-26" ;
    rdfs:comment "Variations on decimal canonicalization" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-26.trig> ;
    mf:result    <trig-subm-26.nq> ;
    .
@@ -2266,7 +2284,7 @@
 <#trig-subm-27> rdf:type rdft:TestTurtleEval ;
    mf:name    "trig-subm-27" ;
    rdfs:comment "Repeating @base changes base for relative IRI lookup" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-subm-27.trig> ;
    mf:result    <trig-subm-27.nq> ;
    .
@@ -2274,28 +2292,28 @@
 <#trig-eval-bad-01> rdf:type rdft:TestTurtleNegativeEval ;
    mf:name    "trig-eval-bad-01" ;
    rdfs:comment "Bad IRI : good escape, bad charcater (negative evaluation test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-eval-bad-01.trig> ;
    .
 
 <#trig-eval-bad-02> rdf:type rdft:TestTurtleNegativeEval ;
    mf:name    "trig-eval-bad-02" ;
    rdfs:comment "Bad IRI : hex 3C is < (negative evaluation test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-eval-bad-02.trig> ;
    .
 
 <#trig-eval-bad-03> rdf:type rdft:TestTurtleNegativeEval ;
    mf:name    "trig-eval-bad-03" ;
    rdfs:comment "Bad IRI : hex 3E is  (negative evaluation test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-eval-bad-03.trig> ;
    .
 
 <#trig-eval-bad-04> rdf:type rdft:TestTurtleNegativeEval ;
    mf:name    "trig-eval-bad-04" ;
    rdfs:comment "Bad IRI : {abc} (negative evaluation test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-eval-bad-04.trig> ;
    .
 
@@ -2304,7 +2322,7 @@
 <#LITERAL_LONG2_with_REVERSE_SOLIDUS> rdf:type rdft:TestTurtleEval ;
    mf:name    "LITERAL_LONG2_with_REVERSE_SOLIDUS" ;
    rdfs:comment "REVERSE SOLIDUS at end of LITERAL_LONG2" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <LITERAL_LONG2_with_REVERSE_SOLIDUS.trig> ;
    mf:result    <LITERAL_LONG2_with_REVERSE_SOLIDUS.nq> ;
    .
@@ -2312,14 +2330,14 @@
 <#trig-syntax-bad-LITERAL2_with_langtag_and_datatype> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-05" ;
    rdfs:comment "Bad number format (negative test)" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-LITERAL2_with_langtag_and_datatype.trig> ;
    .
 
 <#two_LITERAL_LONG2s> rdf:type rdft:TestTurtleEval ;
    mf:name    "two_LITERAL_LONG2s" ;
    rdfs:comment "two LITERAL_LONG2s testing quote delimiter overrun" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <two_LITERAL_LONG2s.trig> ;
    mf:result    <two_LITERAL_LONG2s.nq> ;
    .
@@ -2327,7 +2345,7 @@
 <#langtagged_LONG_with_subtag> rdf:type rdft:TestTurtleEval ;
    mf:name      "langtagged_LONG_with_subtag" ;
    rdfs:comment "langtagged LONG with subtag \"\"\"Cheers\"\"\"@en-UK" ;
-   rdft:approval rdft:Untested ;
+   rdft:approval rdft:Proposed ;
    mf:action    <langtagged_LONG_with_subtag.trig> ;
    mf:result    <langtagged_LONG_with_subtag.nq> ;
    .
@@ -2338,89 +2356,89 @@
 	rdf:type rdft:TestTurtleNegativeSyntax ;
 	rdfs:comment "Blank node label must not end in dot" ;
 	mf:name "trig-syntax-bad-blank-label-dot-end" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-blank-label-dot-end.trig> .
 
 <#trig-syntax-bad-number-dot-in-anon>
 	rdf:type rdft:TestTurtleNegativeSyntax ;
 	rdfs:comment "Dot delimeter may not appear in anonymous nodes" ;
 	mf:name "trig-syntax-bad-number-dot-in-anon" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-number-dot-in-anon.trig> .
 
 <#trig-syntax-bad-ln-dash-start>
 	rdf:type rdft:TestTurtleNegativeSyntax ;
 	rdfs:comment "Local name must not begin with dash" ;
 	mf:name "trig-syntax-bad-ln-dash-start" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-ln-dash-start.trig> .
 
 <#trig-syntax-bad-ln-escape>
 	rdf:type rdft:TestTurtleNegativeSyntax ;
 	rdfs:comment "Bad hex escape in local name" ;
 	mf:name "trig-syntax-bad-ln-escape" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-ln-escape.trig> .
 
 <#trig-syntax-bad-ln-escape-start>
 	rdf:type rdft:TestTurtleNegativeSyntax ;
 	rdfs:comment "Bad hex escape at start of local name" ;
 	mf:name "trig-syntax-bad-ln-escape-start" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-ln-escape-start.trig> .
 
 <#trig-syntax-bad-ns-dot-end>
 	rdf:type rdft:TestTurtleNegativeSyntax ;
 	rdfs:comment "Prefix must not end in dot" ;
 	mf:name "trig-syntax-bad-ns-dot-end" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-ns-dot-end.trig> .
 
 <#trig-syntax-bad-ns-dot-start>
 	rdf:type rdft:TestTurtleNegativeSyntax ;
 	rdfs:comment "Prefix must not start with dot" ;
 	mf:name "trig-syntax-bad-ns-dot-start" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-ns-dot-start.trig> .
 
 <#trig-syntax-bad-missing-ns-dot-end>
 	rdf:type rdft:TestTurtleNegativeSyntax ;
 	rdfs:comment "Prefix must not end in dot (error in triple, not prefix directive like trig-syntax-bad-ns-dot-end)" ;
 	mf:name "trig-syntax-bad-missing-ns-dot-end" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-missing-ns-dot-end.trig> .
 
 <#trig-syntax-bad-missing-ns-dot-start>
 	rdf:type rdft:TestTurtleNegativeSyntax ;
 	rdfs:comment "Prefix must not start with dot (error in triple, not prefix directive like trig-syntax-bad-ns-dot-end)" ;
 	mf:name "trig-syntax-bad-missing-ns-dot-start" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-missing-ns-dot-start.trig> .
 
 <#trig-syntax-ln-dots>
 	rdf:type rdft:TestTurtlePositiveSyntax ;
 	rdfs:comment "Dots in pname local names" ;
 	mf:name "trig-syntax-ln-dots" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-ln-dots.trig> .
 
 <#trig-syntax-ln-colons>
 	rdf:type rdft:TestTurtlePositiveSyntax ;
 	rdfs:comment "Colons in pname local names" ;
 	mf:name "trig-syntax-ln-colons" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-ln-colons.trig> .
 
 <#trig-syntax-ns-dots>
 	rdf:type rdft:TestTurtlePositiveSyntax ;
 	rdfs:comment "Dots in namespace names" ;
 	mf:name "trig-syntax-ns-dots" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-ns-dots.trig> .
 
 <#trig-syntax-blank-label>
 	rdf:type rdft:TestTurtlePositiveSyntax ;
 	rdfs:comment "Characters allowed in blank node labels" ;
 	mf:name "trig-syntax-blank-label" ;
-        rdft:approval rdft:Untested ;
+        rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-blank-label.trig> .
--- a/trig/tests/negative_numeric.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/negative_numeric.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "-1"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://a.example/s> <http://a.example/p> "-1"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
+<http://a.example/s> <http://a.example/p> "-1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
--- a/trig/tests/negative_numeric.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/negative_numeric.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> -1 .}
-<g> {<http://a.example/s> <http://a.example/p> -1 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> -1 .}
--- a/trig/tests/nested_blankNodePropertyLists.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/nested_blankNodePropertyLists.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,6 +1,6 @@
 _:b1 <http://a.example/p1> _:b2 .
 _:b2 <http://a.example/p2> <http://a.example/o2> .
 _:b1 <http://a.example/p> <http://a.example/o> .
-_:b3 <http://a.example/p1> _:b4 <g> .
-_:b4 <http://a.example/p2> <http://a.example/o2> <g> .
-_:b3 <http://a.example/p> <http://a.example/o> <g> .
+_:b3 <http://a.example/p1> _:b4 <http://example/graph> .
+_:b4 <http://a.example/p2> <http://a.example/o2> <http://example/graph> .
+_:b3 <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/nested_blankNodePropertyLists.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/nested_blankNodePropertyLists.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {[ <http://a.example/p1> [ <http://a.example/p2> <http://a.example/o2> ] ; <http://a.example/p> <http://a.example/o> ].}
-<g> {[ <http://a.example/p1> [ <http://a.example/p2> <http://a.example/o2> ] ; <http://a.example/p> <http://a.example/o> ].}
+<http://example/graph> {[ <http://a.example/p1> [ <http://a.example/p2> <http://a.example/o2> ] ; <http://a.example/p> <http://a.example/o> ].}
--- a/trig/tests/nested_collection.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/nested_collection.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -3,8 +3,8 @@
 _:innerEl1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
 _:innerEl1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
 _:outerEl1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-<http://a.example/s> <http://a.example/p> _:outerEl3 <g> .
-_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:innerEl3 <g> .
-_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
-_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <g> .
-_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <g> .
+<http://a.example/s> <http://a.example/p> _:outerEl3 <http://example/graph> .
+_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:innerEl3 <http://example/graph> .
+_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+_:innerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
+_:outerEl3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
--- a/trig/tests/nested_collection.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/nested_collection.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> ((1)) .}
-<g> {<http://a.example/s> <http://a.example/p> ((1)) .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> ((1)) .}
--- a/trig/tests/numeric_with_leading_0.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/numeric_with_leading_0.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "01"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://a.example/s> <http://a.example/p> "01"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
+<http://a.example/s> <http://a.example/p> "01"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
--- a/trig/tests/numeric_with_leading_0.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/numeric_with_leading_0.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> 01 .}
-<g> {<http://a.example/s> <http://a.example/p> 01 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> 01 .}
--- a/trig/tests/objectList_with_two_objects.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/objectList_with_two_objects.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 <http://a.example/s> <http://a.example/p> <http://a.example/o1> .
 <http://a.example/s> <http://a.example/p> <http://a.example/o2> .
-<http://a.example/s> <http://a.example/p> <http://a.example/o1> <g> .
-<http://a.example/s> <http://a.example/p> <http://a.example/o2> <g> .
+<http://a.example/s> <http://a.example/p> <http://a.example/o1> <http://example/graph> .
+<http://a.example/s> <http://a.example/p> <http://a.example/o2> <http://example/graph> .
--- a/trig/tests/objectList_with_two_objects.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/objectList_with_two_objects.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> <http://a.example/o1>, <http://a.example/o2> .}
-<g> {<http://a.example/s> <http://a.example/p> <http://a.example/o1>, <http://a.example/o2> .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> <http://a.example/o1>, <http://a.example/o2> .}
--- a/trig/tests/old_style_base.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/old_style_base.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @base <http://a.example/>.
 {<s> <http://a.example/p> <http://a.example/o> .}
-<g> {<s> <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {<s> <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/old_style_prefix.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/old_style_prefix.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/>.
 {p:s <http://a.example/p> <http://a.example/o> .}
-<g> {p:s <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {p:s <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/percent_escaped_localName.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/percent_escaped_localName.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/%25> <http://a.example/p> <http://a.example/o> .
-<http://a.example/%25> <http://a.example/p> <http://a.example/o> <g> .
+<http://a.example/%25> <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/percent_escaped_localName.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/percent_escaped_localName.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/>.
 {p:%25 <http://a.example/p> <http://a.example/o> .}
-<g> {p:%25 <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {p:%25 <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/positive_numeric.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/positive_numeric.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p> "+1"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://a.example/s> <http://a.example/p> "+1"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
+<http://a.example/s> <http://a.example/p> "+1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
--- a/trig/tests/positive_numeric.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/positive_numeric.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p> +1 .}
-<g> {<http://a.example/s> <http://a.example/p> +1 .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> +1 .}
--- a/trig/tests/predicateObjectList_with_two_objectLists.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/predicateObjectList_with_two_objectLists.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 <http://a.example/s> <http://a.example/p1> <http://a.example/o1> .
 <http://a.example/s> <http://a.example/p2> <http://a.example/o2> .
-<http://a.example/s> <http://a.example/p1> <http://a.example/o1> <g> .
-<http://a.example/s> <http://a.example/p2> <http://a.example/o2> <g> .
+<http://a.example/s> <http://a.example/p1> <http://a.example/o1> <http://example/graph> .
+<http://a.example/s> <http://a.example/p2> <http://a.example/o2> <http://example/graph> .
--- a/trig/tests/predicateObjectList_with_two_objectLists.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/predicateObjectList_with_two_objectLists.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p1> <http://a.example/o1>; <http://a.example/p2> <http://a.example/o2> .}
-<g> {<http://a.example/s> <http://a.example/p1> <http://a.example/o1>; <http://a.example/p2> <http://a.example/o2> .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p1> <http://a.example/o1>; <http://a.example/p2> <http://a.example/o2> .}
--- a/trig/tests/prefix_only_IRI.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/prefix_only_IRI.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/s>.
 {p: <http://a.example/p> <http://a.example/o> .}
-<g> {p: <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {p: <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/prefix_reassigned_and_used.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/prefix_reassigned_and_used.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://b.example/s> <http://a.example/p> <http://a.example/o> .
-<http://b.example/s> <http://a.example/p> <http://a.example/o> <g> .
+<http://b.example/s> <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/prefix_reassigned_and_used.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/prefix_reassigned_and_used.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 @prefix p: <http://a.example/>.
 @prefix p: <http://b.example/>.
 {p:s <http://a.example/p> <http://a.example/o> .}
-<g> {p:s <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {p:s <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/prefix_with_PN_CHARS_BASE_character_boundaries.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/prefix_with_PN_CHARS_BASE_character_boundaries.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿿: <http://a.example/> .
 {<http://a.example/s> <http://a.example/p> AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿿:o .}
-<g> {<http://a.example/s> <http://a.example/p> AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿿:o .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿿:o .}
--- a/trig/tests/prefix_with_non_leading_extras.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/prefix_with_non_leading_extras.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix a·̀ͯ‿.⁀: <http://a.example/>.
 {a·̀ͯ‿.⁀:s <http://a.example/p> <http://a.example/o> .}
-<g> {a·̀ͯ‿.⁀:s <http://a.example/p> <http://a.example/o> .}
\ No newline at end of file
+<http://example/graph> {a·̀ͯ‿.⁀:s <http://a.example/p> <http://a.example/o> .}
\ No newline at end of file
--- a/trig/tests/prefixed_IRI_object.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/prefixed_IRI_object.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/>.
 {<http://a.example/s> <http://a.example/p> p:o .}
-<g> {<http://a.example/s> <http://a.example/p> p:o .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> p:o .}
--- a/trig/tests/prefixed_IRI_predicate.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/prefixed_IRI_predicate.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/>.
 {<http://a.example/s> p:p <http://a.example/o> .}
-<g> {<http://a.example/s> p:p <http://a.example/o> .}
+<http://example/graph> {<http://a.example/s> p:p <http://a.example/o> .}
--- a/trig/tests/prefixed_name_datatype.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/prefixed_name_datatype.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 {<http://a.example/s> <http://a.example/p> "1"^^xsd:integer .}
-<g> {<http://a.example/s> <http://a.example/p> "1"^^xsd:integer .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p> "1"^^xsd:integer .}
--- a/trig/tests/repeated_semis_at_end.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/repeated_semis_at_end.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p1> <http://a.example/o1>;; <http://a.example/p2> <http://a.example/o2> .}
-<g> {<http://a.example/s> <http://a.example/p1> <http://a.example/o1>;; <http://a.example/p2> <http://a.example/o2> .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p1> <http://a.example/o1>;; <http://a.example/p2> <http://a.example/o2> .}
--- a/trig/tests/repeated_semis_not_at_end.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/repeated_semis_not_at_end.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/s> <http://a.example/p1> <http://a.example/o1> .
-<http://a.example/s> <http://a.example/p1> <http://a.example/o1> <g> .
+<http://a.example/s> <http://a.example/p1> <http://a.example/o1> <http://example/graph> .
--- a/trig/tests/repeated_semis_not_at_end.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/repeated_semis_not_at_end.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://a.example/s> <http://a.example/p1> <http://a.example/o1>;; .}
-<g> {<http://a.example/s> <http://a.example/p1> <http://a.example/o1>;; .}
+<http://example/graph> {<http://a.example/s> <http://a.example/p1> <http://a.example/o1>;; .}
--- a/trig/tests/reserved_escaped_localName.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/reserved_escaped_localName.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://a.example/_~.-!$&'()*+,;=/?#@%00> <http://a.example/p> <http://a.example/o> .
-<http://a.example/_~.-!$&'()*+,;=/?#@%00> <http://a.example/p> <http://a.example/o> <g> .
+<http://a.example/_~.-!$&'()*+,;=/?#@%00> <http://a.example/p> <http://a.example/o> <http://example/graph> .
--- a/trig/tests/reserved_escaped_localName.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/reserved_escaped_localName.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix p: <http://a.example/>.
 {p:\_\~\.\-\!\$\&\'\(\)\*\+\,\;\=\/\?\#\@\%00 <http://a.example/p> <http://a.example/o> .}
-<g> {p:\_\~\.\-\!\$\&\'\(\)\*\+\,\;\=\/\?\#\@\%00 <http://a.example/p> <http://a.example/o> .}
+<http://example/graph> {p:\_\~\.\-\!\$\&\'\(\)\*\+\,\;\=\/\?\#\@\%00 <http://a.example/p> <http://a.example/o> .}
--- a/trig/tests/sole_blankNodePropertyList.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/sole_blankNodePropertyList.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {[ <http://a.example/p> <http://a.example/o> ] .}
-<g> {[ <http://a.example/p> <http://a.example/o> ] .}
+<http://example/graph> {[ <http://a.example/p> <http://a.example/o> ] .}
--- a/trig/tests/trig-eval-struct-01.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-eval-struct-01.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://example/s> <http://example/p> <http://example/o> .
-<http://example/s> <http://example/p> <http://example/o> <g> .
+<http://example/s> <http://example/p> <http://example/o> <http://example/graph> .
--- a/trig/tests/trig-eval-struct-01.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-eval-struct-01.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 {<http://example/s> <http://example/p> <http://example/o> .}
-<g> {<http://example/s> <http://example/p> <http://example/o> .}
+<http://example/graph> {<http://example/s> <http://example/p> <http://example/o> .}
--- a/trig/tests/trig-eval-struct-02.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-eval-struct-02.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 <http://example/s> <http://example/p1> <http://example/o1> .
 <http://example/s> <http://example/p2> <http://example/o2> .
-<http://example/s> <http://example/p1> <http://example/o1> <g> .
-<http://example/s> <http://example/p2> <http://example/o2> <g> .
+<http://example/s> <http://example/p1> <http://example/o1> <http://example/graph> .
+<http://example/s> <http://example/p2> <http://example/o2> <http://example/graph> .
--- a/trig/tests/trig-eval-struct-02.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-eval-struct-02.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -5,7 +5,7 @@
       .
 }
 
-<g> {
+<http://example/graph> {
   <http://example/s> 
       <http://example/p1> <http://example/o1> ;
       <http://example/p2> <http://example/o2> ; 
--- a/trig/tests/trig-subm-01.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-01.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
-_:genid1 <http://example/base/trig-subm-01.ttl#x> <http://example/base/trig-subm-01.ttl#y> .
-_:genid2 <http://example/base/trig-subm-01.ttl#x> <http://example/base/trig-subm-01.ttl#y> <g> .
+_:genid1 <ttp://www.w3.org/2013/TriGTests/trig-subm-01.trig#x> <ttp://www.w3.org/2013/TriGTests/trig-subm-01.trig#y> .
+_:genid2 <ttp://www.w3.org/2013/TriGTests/trig-subm-01.trig#x> <ttp://www.w3.org/2013/TriGTests/trig-subm-01.trig#y> <http://example/graph> .
--- a/trig/tests/trig-subm-01.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-01.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,3 +1,3 @@
 @prefix : <#> .
 {[] :x :y .}
-<g> {[] :x :y .}
+<http://example/graph> {[] :x :y .}
--- a/trig/tests/trig-subm-02.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-02.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,6 +1,6 @@
 <http://example.org/base1#a> <http://example.org/base1#b> <http://example.org/base1#c> .
 <http://example.org/base2#a> <http://example.org/base2#b> <http://example.org/base2#c> .
 <http://example.org/base1#a> <http://example.org/base2#a> <http://example.org/base3#a> .
-<http://example.org/base1#a> <http://example.org/base1#b> <http://example.org/base1#c> <g> .
-<http://example.org/base2#a> <http://example.org/base2#b> <http://example.org/base2#c> <g> .
-<http://example.org/base1#a> <http://example.org/base2#a> <http://example.org/base3#a> <g> .
+<http://example.org/base1#a> <http://example.org/base1#b> <http://example.org/base1#c> <http://example/graph> .
+<http://example.org/base2#a> <http://example.org/base2#b> <http://example.org/base2#c> <http://example/graph> .
+<http://example.org/base1#a> <http://example.org/base2#a> <http://example.org/base3#a> <http://example/graph> .
--- a/trig/tests/trig-subm-02.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-02.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -9,7 +9,7 @@
   :a a:a b:a .
 }
 
-<g> {
+<http://example/graph> {
   :a :b :c .
   a:a a:b a:c .
   :a a:a b:a .
--- a/trig/tests/trig-subm-03.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-03.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,6 +1,6 @@
 <http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#c> .
 <http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#d> .
 <http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#e> .
-<http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#c> <g> .
-<http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#d> <g> .
-<http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#e> <g> .
+<http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#c> <http://example/graph> .
+<http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#d> <http://example/graph> .
+<http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#e> <http://example/graph> .
--- a/trig/tests/trig-subm-03.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-03.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -7,7 +7,7 @@
       :e .
 }
 
-<g> {
+<http://example/graph> {
 :a :b :c,
       :d,
       :e .
--- a/trig/tests/trig-subm-04.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-04.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,6 +1,6 @@
 <http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#c> .
 <http://example.org/base#a> <http://example.org/base#d> <http://example.org/base#e> .
 <http://example.org/base#a> <http://example.org/base#f> <http://example.org/base#g> .
-<http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#c> <g> .
-<http://example.org/base#a> <http://example.org/base#d> <http://example.org/base#e> <g> .
-<http://example.org/base#a> <http://example.org/base#f> <http://example.org/base#g> <g> .
+<http://example.org/base#a> <http://example.org/base#b> <http://example.org/base#c> <http://example/graph> .
+<http://example.org/base#a> <http://example.org/base#d> <http://example.org/base#e> <http://example/graph> .
+<http://example.org/base#a> <http://example.org/base#f> <http://example.org/base#g> <http://example/graph> .
--- a/trig/tests/trig-subm-04.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-04.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -7,7 +7,7 @@
    :f :g .
 }
 
-<g> {
+<http://example/graph> {
 :a :b :c ;
    :d :e ;
    :f :g .
--- a/trig/tests/trig-subm-05.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-05.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 _:genid1 <http://example.org/base#a> <http://example.org/base#b> .
 <http://example.org/base#c> <http://example.org/base#d> _:genid2 .
-_:genid3 <http://example.org/base#a> <http://example.org/base#b> <g> .
-<http://example.org/base#c> <http://example.org/base#d> _:genid4 <g> .
+_:genid3 <http://example.org/base#a> <http://example.org/base#b> <http://example/graph> .
+<http://example.org/base#c> <http://example.org/base#d> _:genid4 <http://example/graph> .
--- a/trig/tests/trig-subm-05.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-05.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -6,7 +6,7 @@
 :c :d [] .
 }
 
-<g> {
+<http://example/graph> {
 [] :a :b .
 :c :d [] .
 }
--- a/trig/tests/trig-subm-06.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-06.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -2,7 +2,7 @@
 _:genid1 <http://example.org/base#c> <http://example.org/base#d> .
 _:genid2 <http://example.org/base#g> <http://example.org/base#h> .
 <http://example.org/base#e> <http://example.org/base#f> _:genid2 .
-_:genid3 <http://example.org/base#a> <http://example.org/base#b> <g> .
-_:genid3 <http://example.org/base#c> <http://example.org/base#d> <g> .
-_:genid4 <http://example.org/base#g> <http://example.org/base#h> <g> .
-<http://example.org/base#e> <http://example.org/base#f> _:genid4 <g> .
+_:genid3 <http://example.org/base#a> <http://example.org/base#b> <http://example/graph> .
+_:genid3 <http://example.org/base#c> <http://example.org/base#d> <http://example/graph> .
+_:genid4 <http://example.org/base#g> <http://example.org/base#h> <http://example/graph> .
+<http://example.org/base#e> <http://example.org/base#f> _:genid4 <http://example/graph> .
--- a/trig/tests/trig-subm-06.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-06.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -6,7 +6,7 @@
 :e :f [ :g :h ] .
 }
 
-<g> {
+<http://example/graph> {
 [ :a :b ] :c :d .
 :e :f [ :g :h ] .
 }
--- a/trig/tests/trig-subm-07.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-07.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://example.org/base#a> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/base#b> .
-<http://example.org/base#a> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/base#b> <g> .
+<http://example.org/base#a> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/base#b> <http://example/graph> .
--- a/trig/tests/trig-subm-07.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-07.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 # 'a' only allowed as a predicate
 @prefix : <http://example.org/base#> .
 {:a a :b .}
-<g> {:a a :b .}
+<http://example/graph> {:a a :b .}
--- a/trig/tests/trig-subm-08.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-08.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -4,8 +4,8 @@
 _:genid2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:genid1 .
 <http://example.org/stuff/1.0/a> <http://example.org/stuff/1.0/b> _:genid2 .
 
-_:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" <g> .
-_:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <g> .
-_:genid4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" <g> .
-_:genid4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:genid3 <g> .
-<http://example.org/stuff/1.0/a> <http://example.org/stuff/1.0/b> _:genid4 <g> .
+_:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" <http://example/graph> .
+_:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
+_:genid4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" <http://example/graph> .
+_:genid4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:genid3 <http://example/graph> .
+<http://example.org/stuff/1.0/a> <http://example.org/stuff/1.0/b> _:genid4 <http://example/graph> .
--- a/trig/tests/trig-subm-08.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-08.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 @prefix : <http://example.org/stuff/1.0/> .
 {:a :b ( "apple" "banana" ) .}
-<g> {:a :b ( "apple" "banana" ) .}
+<http://example/graph> {:a :b ( "apple" "banana" ) .}
 
--- a/trig/tests/trig-subm-09.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-09.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://example.org/stuff/1.0/a> <http://example.org/stuff/1.0/b> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-<http://example.org/stuff/1.0/a> <http://example.org/stuff/1.0/b> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <g> .
+<http://example.org/stuff/1.0/a> <http://example.org/stuff/1.0/b> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example/graph> .
--- a/trig/tests/trig-subm-09.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-09.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 @prefix : <http://example.org/stuff/1.0/> .
 {:a :b ( ) .}
-<g> {:a :b ( ) .}
+<http://example/graph> {:a :b ( ) .}
 
--- a/trig/tests/trig-subm-10.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-10.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -2,7 +2,7 @@
 _:genid1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Restriction> .
 _:genid1 <http://www.w3.org/2002/07/owl#onProperty> _:hasParent .
 _:genid1 <http://www.w3.org/2002/07/owl#maxCardinality> "2"^^<http://www.w3.org/2001/XMLSchema#integer> .
-_:hasParent1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> <g> .
-_:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Restriction> <g> .
-_:genid3 <http://www.w3.org/2002/07/owl#onProperty> _:hasParent1 <g> .
-_:genid3 <http://www.w3.org/2002/07/owl#maxCardinality> "2"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
+_:hasParent <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> <http://example/graph> .
+_:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Restriction> <http://example/graph> .
+_:genid3 <http://www.w3.org/2002/07/owl#onProperty> _:hasParent <http://example/graph> .
+_:genid3 <http://www.w3.org/2002/07/owl#maxCardinality> "2"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
--- a/trig/tests/trig-subm-10.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-10.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -11,7 +11,7 @@
   owl:maxCardinality 2 .
 }
 
-<g> {
+<http://example/graph> {
 _:hasParent a owl:ObjectProperty .
 
 [] a owl:Restriction ;
--- a/trig/tests/trig-subm-11.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-11.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -3,8 +3,8 @@
 <http://example.org/res3> <http://example.org/prop3> "000001"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <http://example.org/res4> <http://example.org/prop4> "2"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <http://example.org/res5> <http://example.org/prop5> "4"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.org/res1> <http://example.org/prop1> "000000"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
-<http://example.org/res2> <http://example.org/prop2> "0"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
-<http://example.org/res3> <http://example.org/prop3> "000001"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
-<http://example.org/res4> <http://example.org/prop4> "2"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
-<http://example.org/res5> <http://example.org/prop5> "4"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
+<http://example.org/res1> <http://example.org/prop1> "000000"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+<http://example.org/res2> <http://example.org/prop2> "0"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+<http://example.org/res3> <http://example.org/prop3> "000001"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+<http://example.org/res4> <http://example.org/prop4> "2"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+<http://example.org/res5> <http://example.org/prop5> "4"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
--- a/trig/tests/trig-subm-11.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-11.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -6,7 +6,7 @@
 <http://example.org/res5> <http://example.org/prop5> 4 .
 }
 
-<g> {
+<http://example/graph> {
 <http://example.org/res1> <http://example.org/prop1> 000000 .
 <http://example.org/res2> <http://example.org/prop2> 0 .
 <http://example.org/res3> <http://example.org/prop3> 000001 .
--- a/trig/tests/trig-subm-12.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-12.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -2,7 +2,7 @@
 <http://example.org/ex2#foo-bar> <http://example.org/ex2#foo_bar> "b" .
 <http://example.org/ex3#foo-bar> <http://example.org/ex3#foo_bar> "c" .
 <http://example.org/ex4#foo-bar> <http://example.org/ex4#foo_bar> "d" .
-<http://example.org/ex1#foo-bar> <http://example.org/ex1#foo_bar> "a" <g> .
-<http://example.org/ex2#foo-bar> <http://example.org/ex2#foo_bar> "b" <g> .
-<http://example.org/ex3#foo-bar> <http://example.org/ex3#foo_bar> "c" <g> .
-<http://example.org/ex4#foo-bar> <http://example.org/ex4#foo_bar> "d" <g> .
+<http://example.org/ex1#foo-bar> <http://example.org/ex1#foo_bar> "a" <http://example/graph> .
+<http://example.org/ex2#foo-bar> <http://example.org/ex2#foo_bar> "b" <http://example/graph> .
+<http://example.org/ex3#foo-bar> <http://example.org/ex3#foo_bar> "c" <http://example/graph> .
+<http://example.org/ex4#foo-bar> <http://example.org/ex4#foo_bar> "d" <http://example/graph> .
--- a/trig/tests/trig-subm-12.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-12.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -11,7 +11,7 @@
 ex4-:foo-bar ex4-:foo_bar "d" .
 }
 
-<g> {
+<http://example/graph> {
 ex1:foo-bar ex1:foo_bar "a" .
 ex-2:foo-bar ex-2:foo_bar "b" .
 ex3_:foo-bar ex3_:foo_bar "c" .
--- a/trig/tests/trig-subm-13.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-13.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -2,7 +2,7 @@
 <http://example.org/ex#foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#_2> "2" .
 <http://example.org/ex#foo> <http://example.org/myprop#_abc> "def" .
 <http://example.org/ex#foo> <http://example.org/myprop#_345> "678" .
-<http://example.org/ex#foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#_1> "1" <g> .
-<http://example.org/ex#foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#_2> "2" <g> .
-<http://example.org/ex#foo> <http://example.org/myprop#_abc> "def" <g> .
-<http://example.org/ex#foo> <http://example.org/myprop#_345> "678" <g> .
+<http://example.org/ex#foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#_1> "1" <http://example/graph> .
+<http://example.org/ex#foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#_2> "2" <http://example/graph> .
+<http://example.org/ex#foo> <http://example.org/myprop#_abc> "def" <http://example/graph> .
+<http://example.org/ex#foo> <http://example.org/myprop#_345> "678" <http://example/graph> .
--- a/trig/tests/trig-subm-13.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-13.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -10,7 +10,7 @@
 ex:foo :_345 "678" .
 }
 
-<g> {
+<http://example/graph> {
 ex:foo rdf:_1 "1" .
 ex:foo rdf:_2 "2" .
 ex:foo :_abc "def" .
--- a/trig/tests/trig-subm-14.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-14.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 _:genid1 <http://example.org/ron> _:genid2 .
 <http://example.org/ron> <http://example.org/ron> <http://example.org/ron> .
-_:genid3 <http://example.org/ron> _:genid4 <g> .
-<http://example.org/ron> <http://example.org/ron> <http://example.org/ron> <g> .
+_:genid3 <http://example.org/ron> _:genid4 <http://example/graph> .
+<http://example.org/ron> <http://example.org/ron> <http://example.org/ron> <http://example/graph> .
--- a/trig/tests/trig-subm-14.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-14.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -8,7 +8,7 @@
 
 }
 
-<g> {
+<http://example/graph> {
 [] : [] .
 
 : : : .
--- a/trig/tests/trig-subm-15.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-15.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://example.org/ex#a> <http://example.org/ex#b> "a long\n\tliteral\nwith\nnewlines" .
-<http://example.org/ex#a> <http://example.org/ex#b> "a long\n\tliteral\nwith\nnewlines" <g> .
+<http://example.org/ex#a> <http://example.org/ex#b> "a long\n\tliteral\nwith\nnewlines" <http://example/graph> .
--- a/trig/tests/trig-subm-15.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-15.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -8,7 +8,7 @@
 newlines""" .
 }
 
-<g> {
+<http://example/graph> {
 :a :b """a long
 	literal
 with
--- a/trig/tests/trig-subm-16.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-16.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 <http://example.org/foo#a> <http://example.org/foo#b> "\nthis \ris a \U00012451long\t\nliteral\uABCD\n" .
 <http://example.org/foo#d> <http://example.org/foo#e> "\tThis \uABCDis\r \U00012451another\n\none\n" .
-<http://example.org/foo#a> <http://example.org/foo#b> "\nthis \ris a \U00012451long\t\nliteral\uABCD\n" <g> .
-<http://example.org/foo#d> <http://example.org/foo#e> "\tThis \uABCDis\r \U00012451another\n\none\n" <g> .
+<http://example.org/foo#a> <http://example.org/foo#b> "\nthis \ris a \U00012451long\t\nliteral\uABCD\n" <http://example/graph> .
+<http://example.org/foo#d> <http://example.org/foo#e> "\tThis \uABCDis\r \U00012451another\n\none\n" <http://example/graph> .
--- a/trig/tests/trig-subm-16.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-16.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -21,7 +21,7 @@
 """ .
 }
 
-<g> {
+<http://example/graph> {
 ## \U00015678 is a not a legal codepoint
 ## :a :b """\nthis \ris a \U00015678long\t
 ## literal\uABCD
--- a/trig/tests/trig-subm-17.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-17.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://example.org/#a> <http://example.org/#b> "1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> .
-<http://example.org/#a> <http://example.org/#b> "1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> <g> .
+<http://example.org/#a> <http://example.org/#b> "1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> <http://example/graph> .
--- a/trig/tests/trig-subm-17.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-17.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,5 +1,5 @@
 @prefix : <http://example.org/#> .
 
 {:a :b  1.0 .}
-<g> {:a :b  1.0 .}
+<http://example/graph> {:a :b  1.0 .}
 
--- a/trig/tests/trig-subm-18.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-18.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 <http://example.org/#a> <http://example.org/#b> "" .
 <http://example.org/#c> <http://example.org/#d> "" .
-<http://example.org/#a> <http://example.org/#b> "" <g> .
-<http://example.org/#c> <http://example.org/#d> "" <g> .
+<http://example.org/#a> <http://example.org/#b> "" <http://example/graph> .
+<http://example.org/#c> <http://example.org/#d> "" <http://example/graph> .
--- a/trig/tests/trig-subm-18.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-18.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -7,7 +7,7 @@
 
 }
 
-<g> {
+<http://example/graph> {
 :a :b "" .
 
 :c :d """""" .
--- a/trig/tests/trig-subm-19.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-19.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,6 +1,6 @@
 <http://example.org#a> <http://example.org#b> "1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> .
 <http://example.org#c> <http://example.org#d> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <http://example.org#e> <http://example.org#f> "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> .
-<http://example.org#a> <http://example.org#b> "1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> <g> .
-<http://example.org#c> <http://example.org#d> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
-<http://example.org#e> <http://example.org#f> "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> <g> .
+<http://example.org#a> <http://example.org#b> "1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> <http://example/graph> .
+<http://example.org#c> <http://example.org#d> "1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+<http://example.org#e> <http://example.org#f> "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> <http://example/graph> .
--- a/trig/tests/trig-subm-19.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-19.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -6,7 +6,7 @@
 :e :f 1.0e0 .
 }
 
-<g> {
+<http://example/graph> {
 :a :b 1.0 .
 :c :d 1 .
 :e :f 1.0e0 .
--- a/trig/tests/trig-subm-20.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-20.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,6 +1,6 @@
 <http://example.org#a> <http://example.org#b> "-1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> .
 <http://example.org#c> <http://example.org#d> "-1"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <http://example.org#e> <http://example.org#f> "-1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> .
-<http://example.org#a> <http://example.org#b> "-1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> <g> .
-<http://example.org#c> <http://example.org#d> "-1"^^<http://www.w3.org/2001/XMLSchema#integer> <g> .
-<http://example.org#e> <http://example.org#f> "-1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> <g> .
+<http://example.org#a> <http://example.org#b> "-1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> <http://example/graph> .
+<http://example.org#c> <http://example.org#d> "-1"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example/graph> .
+<http://example.org#e> <http://example.org#f> "-1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> <http://example/graph> .
--- a/trig/tests/trig-subm-20.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-20.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -6,7 +6,7 @@
 :e :f -1.0e0 .
 }
 
-<g> {
+<http://example/graph> {
 :a :b -1.0 .
 :c :d -1 .
 :e :f -1.0e0 .
--- a/trig/tests/trig-subm-21.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-21.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://example.org/ex#a> <http://example.org/ex#b> "John said: \"Hello World!\"" .
-<http://example.org/ex#a> <http://example.org/ex#b> "John said: \"Hello World!\"" <g> .
+<http://example.org/ex#a> <http://example.org/ex#b> "John said: \"Hello World!\"" <http://example/graph> .
--- a/trig/tests/trig-subm-21.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-21.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 # Test long literal
 @prefix :  <http://example.org/ex#> .
 {:a :b """John said: "Hello World!\"""" .}
-<g> {:a :b """John said: "Hello World!\"""" .}
+<http://example/graph> {:a :b """John said: "Hello World!\"""" .}
--- a/trig/tests/trig-subm-22.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-22.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
 <http://example.org#a> <http://example.org#b> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> .
 <http://example.org#c> <http://example.org#d> "false"^^<http://www.w3.org/2001/XMLSchema#boolean> .
-<http://example.org#a> <http://example.org#b> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> <g> .
-<http://example.org#c> <http://example.org#d> "false"^^<http://www.w3.org/2001/XMLSchema#boolean> <g> .
+<http://example.org#a> <http://example.org#b> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> <http://example/graph> .
+<http://example.org#c> <http://example.org#d> "false"^^<http://www.w3.org/2001/XMLSchema#boolean> <http://example/graph> .
--- a/trig/tests/trig-subm-22.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-22.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -5,7 +5,7 @@
 :c :d false .
 }
 
-<g> {
+<http://example/graph> {
 :a :b true .
 :c :d false .
 }
--- a/trig/tests/trig-subm-23.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-23.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -5,10 +5,10 @@
 <http://example.org/#k> <http://example.org/#l> <http://example.org/#m> .
 <http://example.org/#k> <http://example.org/#n> <http://example.org/#o> .
 <http://example.org/#k> <http://example.org/#p> <http://example.org/#q> .
-<http://example.org/#a> <http://example.org/#b> <http://example.org/#c> <g> .
-<http://example.org/#d> <http://example.org/#e> <http://example.org/#f> <g> .
-<http://example.org/#g> <http://example.org/#h> <http://example.org/#i> <g> .
-<http://example.org/#g> <http://example.org/#h> <http://example.org/#j> <g> .
-<http://example.org/#k> <http://example.org/#l> <http://example.org/#m> <g> .
-<http://example.org/#k> <http://example.org/#n> <http://example.org/#o> <g> .
-<http://example.org/#k> <http://example.org/#p> <http://example.org/#q> <g> .
+<http://example.org/#a> <http://example.org/#b> <http://example.org/#c> <http://example/graph> .
+<http://example.org/#d> <http://example.org/#e> <http://example.org/#f> <http://example/graph> .
+<http://example.org/#g> <http://example.org/#h> <http://example.org/#i> <http://example/graph> .
+<http://example.org/#g> <http://example.org/#h> <http://example.org/#j> <http://example/graph> .
+<http://example.org/#k> <http://example.org/#l> <http://example.org/#m> <http://example/graph> .
+<http://example.org/#k> <http://example.org/#n> <http://example.org/#o> <http://example/graph> .
+<http://example.org/#k> <http://example.org/#p> <http://example.org/#q> <http://example/graph> .
--- a/trig/tests/trig-subm-23.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-23.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -16,7 +16,7 @@
    :p :q . # and me
 }
 
-<g> {
+<http://example/graph> {
 :a :b :c . # end of line comment
 :d # ignore me
   :e # and me
--- a/trig/tests/trig-subm-24.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-24.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://example.org/#a> <http://example.org/#b> <http://example.org/#c> .
-<http://example.org/#a> <http://example.org/#b> <http://example.org/#c> <g> .
+<http://example.org/#a> <http://example.org/#b> <http://example.org/#c> <http://example/graph> .
--- a/trig/tests/trig-subm-24.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-24.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,5 +1,5 @@
 # comment line with no final newline test
 @prefix : <http://example.org/#> .
 {:a :b :c .}
-<g> {:a :b :c .}
+<http://example/graph> {:a :b :c .}
 #foo
--- a/trig/tests/trig-subm-25.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-25.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 <http://example.org/bar#blah> <http://example.org/bar#blah> <http://example.org/bar#blah> .
-<http://example.org/bar#blah> <http://example.org/bar#blah> <http://example.org/bar#blah> <g> .
+<http://example.org/bar#blah> <http://example.org/bar#blah> <http://example.org/bar#blah> <http://example/graph> .
--- a/trig/tests/trig-subm-25.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-25.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -2,4 +2,4 @@
 @prefix foo: <http://example.org/bar#>  .
 
 {foo:blah foo:blah foo:blah .}
-<g> {foo:blah foo:blah foo:blah .}
+<http://example/graph> {foo:blah foo:blah foo:blah .}
--- a/trig/tests/trig-subm-27.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-27.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,4 @@
-<http://example/base/a1> <http://example/base/b1> <http://example/base/c1> .
+<ttp://www.w3.org/2013/TriGTests/a1> <ttp://www.w3.org/2013/TriGTests/b1> <ttp://www.w3.org/2013/TriGTests/c1> .
 <http://example.org/ns/a2> <http://example.org/ns/b2> <http://example.org/ns/c2> .
 <http://example.org/ns/foo/a3> <http://example.org/ns/foo/b3> <http://example.org/ns/foo/c3> .
 <http://example.org/ns/foo/bar#a4> <http://example.org/ns/foo/bar#b4> <http://example.org/ns/foo/bar#c4> .
--- a/trig/tests/trig-subm-27.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-subm-27.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,5 +1,5 @@
-# In-scope base URI is <http://example/base/trig-subm-27.ttl> at this point
-<a1> <b1> <c1> .
+# In-scope base URI is <ttp://www.w3.org/2013/TriGTests/trig-subm-27.trig> at this point
+{<a1> <b1> <c1> .}
 @base <http://example.org/ns/> .
 # In-scope base URI is http://example.org/ns/ at this point
 {<a2> <http://example.org/ns/b2> <c2> .}
--- a/trig/tests/trig-syntax-bad-struct-03.trig	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/trig-syntax-bad-struct-03.trig	Thu Jun 13 16:38:07 2013 -0700
@@ -1,2 +1,2 @@
 # Turtle is not NQuads
-<http://example/s> <http://example/p> <http://example/o> <http://example/g> .
+<http://example/s> <http://example/p> <http://example/o> <http://example/graph> .
--- a/trig/tests/two_LITERAL_LONG2s.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/two_LITERAL_LONG2s.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,4 +1,2 @@
-{
 <http://example.org/ex#a> <http://example.org/ex#b> "first long literal" .
 <http://example.org/ex#c> <http://example.org/ex#d> "second long literal" .
-}
--- a/trig/tests/underscore_in_localName.nq	Wed Jun 12 16:51:52 2013 -0700
+++ b/trig/tests/underscore_in_localName.nq	Thu Jun 13 16:38:07 2013 -0700
@@ -1,1 +1,1 @@
-{<http://a.example/s_> <http://a.example/p> <http://a.example/o> .}
+<http://a.example/s_> <http://a.example/p> <http://a.example/o> .