 	// MARK: One-of
 
 	func testOneOfParsesFirstMatch() {
-		let xyz = oneOf(["x", "y", "z"])
-		assertTree(xyz, "xyz", ==, "x")
-		assertTree(xyz, "yzx", ==, "y")
-		assertTree(xyz, "zxy", ==, "z")
+		assertTree(one, "xyz", ==, "x")
+		assertTree(one, "yzx", ==, "y")
+		assertTree(one, "zxy", ==, "z")
 	}
 
 
 	// MARK: Any-of
 
 	func testAnyOfParsesAnArrayOfMatchesPreservingOrder() {
-		let xyz = anyOf(["x", "y", "z"])
-		assertTree(xyz, "xy", ==, ["x", "y"])
-		assertTree(xyz, "yx", ==, ["y", "x"])
-		assertTree(xyz, "zxy", ==, ["z", "x", "y"])
+		assertTree(any, "xy", ==, ["x", "y"])
+		assertTree(any, "yx", ==, ["y", "x"])
+		assertTree(any, "zxy", ==, ["z", "x", "y"])
 	}
 
 	func testAnyOfRejectsWhenNoneMatch() {

	}

	func testAnyOfOnlyParsesFirstMatch() {
		let xyz = anyOf(["x", "y", "z"])
		assertTree(xyz, "xyy", ==, ["x", "y"])
	}


	// MARK: All-of

	func testAllOfParsesAnArrayOfMatchesPreservingOrder() {
		let xyz = allOf(["x", "y", "z"])
		assertTree(xyz, "xy", ==, ["x", "y"])
		assertTree(xyz, "yx", ==, ["y", "x"])
		assertTree(xyz, "zxy", ==, ["z", "x", "y"])
	}

	func testAllOfRejectsWhenNoneMatch() {

	}

	func testAllOfParsesAllMatches() {
		assertTree(all, "xyyxz", ==, ["x", "y", "y", "x", "z"])
	}

}
