 //: numbers, and certain kinds of special characters.  We already have generators for upper and
 //: lower cased letters, so all we need are special characters and a more complete number generator:
 
-let numeric : Gen<Character> = Gen<Character>.fromElementsIn("0"..."9")
-let special : Gen<Character> = Gen<Character>.fromElementsOf(["!", "#", "$", "%", "&", "'", "*", "+", "-", "/", "=", "?", "^", "_", "`", "{", "|", "}", "~", "."])
+let numeric : Gen<Character> = Gen<Character>.fromElements(in: "0"..."9")
+let special : Gen<Character> = Gen<Character>.fromElements(of: ["!", "#", "$", "%", "&", "'", "*", "+", "-", "/", "=", "?", "^", "_", "`", "{", "|", "}", "~", "."])
 
 //: Now for the actual generator
 
-let allowedLocalCharacters : Gen<Character> = Gen<Character>.oneOf([
+let allowedLocalCharacters : Gen<Character> = Gen<Character>.one(of: [
 	upperCaseLetters,
 	lowerCaseLetters,
 	numeric,

fromOnetoFive.generate
fromOnetoFive.generate

let lowerCaseLetters : Gen<Character> = Gen<Character>.fromElementsIn("a"..."z")

lowerCaseLetters.generate
lowerCaseLetters.generate
lowerCaseLetters.generate

let upperCaseLetters : Gen<Character> = Gen<Character>.fromElementsIn("A"..."Z")

upperCaseLetters.generate
upperCaseLetters.generate

reportProperty("All Prime") <- forAll { (n : Positive<Int>) in
	let primes = sieve(n: n.getPositive)
	return primes.count > 1 ==> {
		let primeNumberGen = Gen<Int>.fromElements(of: primes)
		return forAll(primeNumberGen) { (p : Int) in
			return isPrime(p)
		}
