Merge pull request #442 from mindworks-software/updated_resource_files

Fix postcode property name
2020-07-06 18:18:14 +10:00 · 2019-09-26 12:28:20 +02:00
97 changed files with 180 additions and 2898 deletions
@@ -1,25 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Code to reproduce
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Versions:**
- - OS: [e.g. OSX]
- - JDK
- - Faker Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
@@ -1,20 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
@@ -6,5 +6,3 @@ target
 *.iml
 .java-version
 /dependency-reduced-pom.xml
-META-INF/
-bin/
@@ -6,14 +6,12 @@ jdk:
 - openjdk10
 - oraclejdk11
 sudo: true
-script: mvn verify failsafe:integration-test failsafe:verify
+script: "mvn verify failsafe:integration-test failsafe:verify"
 branches:
  except:
  - travis
 notifications:
  email: false
 after_success:
- mvn clean cobertura:cobertura coveralls:report
-env:
-  global:
-    secure: GIdF3itH9owJXPEb/ri984853yRRIDeWbSZW7yMh6XOymGWAi0+3fGssBbHqjS/s3QgiDhnrKfDjF7UhHE1aeYCxgHM5QGOjfHUhOKevhUE4u0h4ysFS4wbh7zYODMzxdFpiKwdnNF+TvMctIReH5IVDu8gUxbNrcSXN6PQgvlM=
+- mvn clean cobertura:cobertura coveralls:cobertura
+
@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at rickyyim AT gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
@@ -17,7 +17,7 @@ In pom.xml, add the following xml stanza between `<dependencies> ... </dependenc
 <dependency>
    <groupId>com.github.javafaker</groupId>
    <artifactId>javafaker</artifactId>
-    <version>1.0.1</version>
+    <version>0.18</version>
 </dependency>
 ```

@@ -25,7 +25,7 @@ For gradle users, add the following to your build.gradle file.

 ```groovy
 dependencies {
-    implementation 'com.github.javafaker:javafaker:1.0.1'
+    implementation 'com.github.javafaker:javafaker:0.18'
 }

 ```
@@ -42,8 +42,6 @@ String lastName = faker.name().lastName(); // Barton
 String streetAddress = faker.address().streetAddress(); // 60018 Sawayn Brooks Suite 449
 ```

-This is a [demo web application](https://java-faker.herokuapp.com/) that uses the library.
-
 Javadoc
 -----
 http://dius.github.io/java-faker/apidocs/index.html
@@ -56,14 +54,11 @@ See [CONTRIBUTING.md](https://github.com/DiUS/java-faker/blob/master/CONTRIBUTIN

 Fakers
 -----
-* Address
 * Ancient
-* Animal
+* Address
 * App
-* Aqua Teen Hunger Force
 * Artist
 * Avatar
-* Back To The Future
 * Aviation
 * Beer
 * Book
@@ -80,7 +75,6 @@ Fakers
 * Demographic
 * Dog
 * DragonBall
-* Dune
 * Educator
 * Esports
 * File
@@ -105,14 +99,11 @@ Fakers
 * Matz
 * Music
 * Name
-* Nation
 * Number
 * Options
 * Overwatch
 * PhoneNumber
 * Pokemon
-* Princess Bride
-* Relationship Terms
 * RickAndMorty
 * Robin
 * RockBand
@@ -168,7 +159,6 @@ Supported Locales
 * fi-FI
 * fr
 * he
-* hu
 * in-ID
 * it
 * ja
@@ -3,7 +3,7 @@
    <groupId>com.github.javafaker</groupId>
    <artifactId>javafaker</artifactId>
    <packaging>jar</packaging>
-    <version>1.0.2</version>
+    <version>1.0.1-SNAPSHOT</version>
    <name>Java Faker</name>
    <description>
    	This library is a port of Ruby's stympy/faker gem (as well as Perl's Data::Faker library) that generates fake data.
@@ -1,13 +0,0 @@
-package com.github.javafaker;
-
-public class Animal {
-    private final Faker faker;
-
-    protected Animal(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String name() {
-        return faker.fakeValuesService().resolve("creature.animal.name", this, faker);
-    }
-}
@@ -1,15 +0,0 @@
-package com.github.javafaker;
-
-public class AquaTeenHungerForce {
-
-    private final Faker faker;
-
-    protected AquaTeenHungerForce(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String character() {
-        return faker.fakeValuesService().resolve("aqua_teen_hunger_force.character", this, faker);
-    }
-
-}
@@ -1,30 +0,0 @@
-package com.github.javafaker;
-
-public class Buffy {
-    private final Faker faker;
-
-    protected Buffy(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String characters() {
-        return faker.fakeValuesService().resolve("buffy.characters", this, faker);
-    }
-
-    public String quotes() {
-        return faker.fakeValuesService().resolve("buffy.quotes", this, faker);
-    }
-
-    public String celebrities() {
-        return faker.fakeValuesService().resolve("buffy.celebrities", this, faker);
-    }
-
-    public String bigBads() {
-        return faker.fakeValuesService().resolve("buffy.big_bads", this, faker);
-    }
-
-    public String episodes() {
-        return faker.fakeValuesService().resolve("buffy.episodes", this, faker);
-    }
-
-}
@@ -69,13 +69,13 @@ public class Company {
    }

    public String url() {
-        return join(
+        return join(new Object[]{
                "www",
                ".",
                FakerIDN.toASCII(domainName()),
                ".",
                domainSuffix()
-        );
+        });
    }

    private String domainName(){
@@ -144,10 +144,6 @@ public class DateAndTime {
            throw new IllegalArgumentException("Invalid date range, the upper bound date is before the lower bound.");
        }

-        if (from.equals(to)) {
-            return from;
-        }
-
        long offsetMillis = faker.random().nextLong(to.getTime() - from.getTime());
        return new Date(from.getTime() + offsetMillis);
    }
@@ -174,10 +170,8 @@ public class DateAndTime {
     */
    public Date birthday(int minAge, int maxAge) {
        int currentYear = Calendar.getInstance().get(Calendar.YEAR);
-        int currentMonth = Calendar.getInstance().get(Calendar.MONTH);
-        int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
-        Calendar from = new GregorianCalendar(currentYear - maxAge, currentMonth, currentDay);
-        Calendar to = new GregorianCalendar(currentYear - minAge, currentMonth, currentDay);
+        Calendar from = new GregorianCalendar(currentYear - maxAge, 0, 1);
+        Calendar to = new GregorianCalendar(currentYear - minAge, 11, 31);

        return between(from.getTime(), to.getTime());
    }
@@ -1,80 +0,0 @@
-package com.github.javafaker;
-
-public class Dune {
-
-    private final Faker faker;
-
-    protected Dune(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String character() {
-        return faker.fakeValuesService().resolve("dune.characters", this, faker);
-    }
-
-    public String title() {
-        return faker.fakeValuesService().resolve("dune.titles", this, faker);
-    }
-
-    public String planet() {
-        return faker.fakeValuesService().resolve("dune.planets", this, faker);
-    }
-
-    public String quote() {
-        return quote(faker.options().option(Dune.Quote.class));
-    }
-
-    public String quote(Quote quote) {
-        return faker.fakeValuesService().resolve("dune.quotes." + quote.yamlKey, this, faker);
-    }
-
-    public String saying() {
-        return saying(faker.options().option(Dune.Saying.class));
-    }
-
-    public String saying(Saying saying) {
-        return faker.fakeValuesService().resolve("dune.sayings." + saying.yamlKey, this, faker);
-    }
-
-    public enum Quote {
-        GUILD_NAIVGATOR("guild_navigator"),
-        EMPEROR("emperor"),
-        PAUL("paul"),
-        THUFIR("thufir"),
-        JESSICA("jessica"),
-        IRULAN("irulan"),
-        MOHIAM("mohiam"),
-        GURNEY("gurney"),
-        LETO("leto"),
-        STILGAR("stilgar"),
-        LIET_KYNES("liet_kynes"),
-        PARDOT_KYNES("pardot_kynes"),
-        BARON_HARKONNEN("baron_harkonnen"),
-        PITER("piter"),
-        ALIA("alia"),
-        MAPES("mapes"),
-        DUNCAN("duncan"),
-        YUEH("yueh");
-
-        private final String yamlKey;
-
-        Quote(String yamlKey) {
-            this.yamlKey = yamlKey;
-        }
-    }
-
-    public enum Saying {
-        BENE_GESSERIT("bene_gesserit"),
-        FREMEN("fremen"),
-        MENTAT("mentat"),
-        MUADDIB("muaddib"),
-        ORANGE_CATHOLIC_BIBLE("orange_catholic_bible");
-
-        private final String yamlKey;
-
-        Saying(String yamlKey) {
-            this.yamlKey = yamlKey;
-        }
-    }
-
-}
@@ -1,41 +0,0 @@
-package com.github.javafaker;
-
-public class ElderScrolls {
-
-    private final Faker faker;
-
-    protected ElderScrolls(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String race() {
-        return faker.fakeValuesService().resolve("games.elder_scrolls.race", this, faker);
-    }
-
-    public String creature() {
-        return faker.fakeValuesService().resolve("games.elder_scrolls.creature", this, faker);
-    }
-
-    public String region() {
-        return faker.fakeValuesService().resolve("games.elder_scrolls.region", this, faker);
-    }
-
-    public String dragon() {
-        return faker.fakeValuesService().resolve("games.elder_scrolls.dragon", this, faker);
-    }
-
-    public String city() {
-        return faker.fakeValuesService().resolve("games.elder_scrolls.city", this, faker);
-    }
-
-    public String firstName() {
-        return faker.fakeValuesService().resolve("games.elder_scrolls.first_name", this, faker);
-    }
-
-    public String lastName() {
-        return faker.fakeValuesService().resolve("games.elder_scrolls.last_name", this, faker);
-    }
-
-    public String quote() {return faker.fakeValuesService().resolve("games.elder_scrolls.quote", this, faker);
-    }
-}
@@ -49,7 +49,6 @@ public class Faker {
    private final Demographic demographic;
    private final Dog dog;
    private final Educator educator;
-    private final ElderScrolls elderScrolls;
    private final Shakespeare shakespeare;
    private final SlackEmoji slackEmoji;
    private final Space space;
@@ -86,22 +85,14 @@ public class Faker {
    private final Weather weather;
    private final Lebowski lebowski;
    private final Medical medical;
-    private final Animal animal;
    private final BackToTheFuture backToTheFuture;
-    private final PrincessBride princessBride;
-    private final Buffy buffy;
-    private final Relationships relationships;
-    private final Nation nation;
-    private final Dune dune;
-    private final AquaTeenHungerForce aquaTeenHungerForce;
-    private final ProgrammingLanguage programmingLanguage;

    public Faker() {
        this(Locale.ENGLISH);
    }

    public Faker(Locale locale) {
-        this(locale, (Random)null);
+        this(locale, null);
    }

    public Faker(Random random) {
@@ -109,16 +100,8 @@ public class Faker {
    }

    public Faker(Locale locale, Random random) {
-        this(locale, new RandomService(random));
-    }
-
-    public Faker(Locale locale, RandomService randomService) {
-        this(new FakeValuesService(locale, randomService), randomService);
-    }
-
-    public Faker(FakeValuesService fakeValuesService, RandomService random) {
-        this.randomService = random;
-        this.fakeValuesService = fakeValuesService;
+        this.randomService = new RandomService(random);
+        this.fakeValuesService = new FakeValuesService(locale, randomService);

        this.ancient = new Ancient(this);
        this.app = new App(this);
@@ -141,7 +124,6 @@ public class Faker {
        this.hacker = new Hacker(this);
        this.company = new Company(this);
        this.crypto = new Crypto(this);
-        this.elderScrolls = new ElderScrolls(this);
        this.commerce = new Commerce(this);
        this.currency = new Currency(this);
        this.options = new Options(this);
@@ -190,15 +172,7 @@ public class Faker {
        this.lebowski = new Lebowski(this);
        this.medical = new Medical(this);
        this.country = new Country(this);
-        this.animal = new Animal(this);
        this.backToTheFuture = new BackToTheFuture(this);
-        this.princessBride = new PrincessBride(this);
-        this.buffy = new Buffy(this);
-        this.relationships = new Relationships(this);
-        this.nation = new Nation(this);
-        this.dune = new Dune(this);
-        this.aquaTeenHungerForce = new AquaTeenHungerForce(this);
-        this.programmingLanguage = new ProgrammingLanguage(this);
    }

    /**
@@ -379,10 +353,6 @@ public class Faker {
        return book;
    }

-    public Buffy buffy() {
-        return buffy;
-    }
-
    public Business business() {
        return business;
    }
@@ -435,10 +405,6 @@ public class Faker {
        return food;
    }

-    public ElderScrolls elderScrolls() {
-        return elderScrolls;
-    }
-
    public GameOfThrones gameOfThrones() {
        return gameOfThrones;
    }
@@ -599,36 +565,10 @@ public class Faker {

    public Country country(){ return country;}

-    public Animal animal(){ return animal; }
-
    public BackToTheFuture backToTheFuture() {
        return  backToTheFuture;
    }

-    public PrincessBride princessBride() {
-        return princessBride;
-    }
-
-    public Relationships relationships() {
-        return relationships;
-    }
-
-    public Nation nation() {
-        return nation;
-    }
-
-    public Dune dune() {
-        return dune;
-    }
-
-    public AquaTeenHungerForce aquaTeenHungerForce() {
-        return aquaTeenHungerForce;
-    }
-
-    public ProgrammingLanguage programmingLanguage() {
-        return programmingLanguage;
-    }
-
    public String resolve(String key) {
        return this.fakeValuesService.resolve(key, this, this);
    }
@@ -24,6 +24,6 @@ public class File {
        final String dir = dirOrNull == null ? faker.internet().slug() : dirOrNull;
        final String name = nameOrNull == null ? faker.lorem().word().toLowerCase() : nameOrNull;
        final String ext = extensionOrNull == null ? extension() : extensionOrNull;
-        return dir + sep + name + "." + ext;
+        return new StringBuilder(dir).append(sep).append(name).append(".").append(ext).toString();
    }
 }
@@ -16,22 +16,6 @@ public class Food {
        return faker.fakeValuesService().resolve("food.spices", this, faker);
    }

-    public String dish() {
-        return faker.fakeValuesService().resolve("food.dish", this, faker);
-    }
-
-    public String fruit() {
-        return faker.fakeValuesService().resolve("food.fruits", this, faker);
-    }
-
-    public String vegetable() {
-        return faker.fakeValuesService().resolve("food.vegetables", this, faker);
-    }
-
-    public String sushi() {
-        return faker.fakeValuesService().resolve("food.sushi", this, faker);
-    }
-
    public String measurement() {
        return faker.fakeValuesService().resolve("food.measurement_sizes", this, faker) +
            " " + faker.fakeValuesService().resolve("food.measurements", this, faker);
@@ -22,12 +22,4 @@ public class HarryPotter {
    public String book() {
        return faker.resolve("harry_potter.books");
    }
-
-    public String house() {
-        return faker.resolve("harry_potter.houses");
-    }
-
-    public String spell() {
-        return faker.resolve("harry_potter.spells");
-    }
 }
@@ -51,7 +51,7 @@ public class Internet {
    }

    public String url() {
-        return join(
+        return join(new Object[]{
                "www",
                ".",
                FakerIDN.toASCII(
@@ -61,7 +61,7 @@ public class Internet {
                ),
                ".",
                domainSuffix()
-        );
+        });
    }

    /**
@@ -20,7 +20,7 @@ public class Lorem {
    }

    public char character(boolean includeUppercase) {
-        return characters(1, includeUppercase).charAt(0);
+        return characters(1).charAt(0);
    }

    public String characters() {
@@ -28,7 +28,7 @@ public class Lorem {
    }

    public String characters(boolean includeUppercase) {
-        return characters(255, includeUppercase);
+        return characters(255, false);
    }

    public String characters(int minimumLength, int maximumLength) {
@@ -121,20 +121,12 @@ public class Name {
     */
    public String username() {

-        String username = StringUtils.join(
+        String username = StringUtils.join(new String[]{
                firstName().replaceAll("'", "").toLowerCase(),
                ".",
-                lastName().replaceAll("'", "").toLowerCase()
+                lastName().replaceAll("'", "").toLowerCase()}
        );

        return StringUtils.deleteWhitespace(username);
    }
-    
-    /**
-     * <p>Returns a blood group such as O−, O+, A-, A+, B-, B+, AB-, AB+</p>
-     * @return a blood group such as O−, O+, A-, A+, B-, B+, AB-, AB+
-     */
-    public String bloodGroup() {
-        return faker.fakeValuesService().resolve("name.blood_group", this, faker);
-    }
 }
@@ -1,43 +0,0 @@
-package com.github.javafaker;
-
-import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.charset.Charset;
-import java.util.List;
-
-public class Nation {
-
-    private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
-
-    private final Faker faker;
-
-    protected Nation(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String nationality() {
-        return faker.fakeValuesService().resolve("nation.nationality", this, faker);
-    }
-
-    public String language() {
-        return faker.fakeValuesService().resolve("nation.language", this, faker);
-    }
-
-    public String capitalCity() {
-        return faker.fakeValuesService().resolve("nation.capital_city", this, faker);
-    }
-
-    public String flag() {
-        @SuppressWarnings("unchecked")
-        List<Integer> flagInts = (List<Integer>) faker.fakeValuesService().fetch("nation.flag");
-
-        ByteBuffer byteBuffer = MappedByteBuffer.allocate(flagInts.size());
-
-        for (Integer flagInt : flagInts) {
-            byteBuffer.put(flagInt.byteValue());
-        }
-
-        return new String(byteBuffer.array(), UTF8_CHARSET);
-    }
-
-}
@@ -27,10 +27,7 @@ public class Number {
     * @see Number#numberBetween(long, long) 
     */
    public int numberBetween(int min, int max) {
-        if (min == max) return min;
-
-        int value = decimalBetween(min,max).setScale(0, BigDecimal.ROUND_HALF_DOWN).intValue();
-        return value == max ? value - 1 : value;
+        return decimalBetween(min,max).setScale(0, BigDecimal.ROUND_HALF_DOWN).intValue();
    }

    /**
@@ -42,10 +39,7 @@ public class Number {
     * @param max exclusive (unless min == max)
     */
    public long numberBetween(long min, long max) {
-        if (min == max) return min;
-
-        long value = decimalBetween(min, max).setScale(0, BigDecimal.ROUND_HALF_DOWN).longValue();
-        return value == max ? value - 1 : value;
+        return decimalBetween(min,max).longValue();
    }
    
    /**
@@ -1,17 +0,0 @@
-package com.github.javafaker;
-
-public class PrincessBride {
-    private final Faker faker;
-
-    protected PrincessBride(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String character() {
-        return faker.resolve("princess_bride.characters");
-    }
-
-    public String quote() {
-        return faker.resolve("princess_bride.quotes");
-    }
-}
@@ -1,19 +0,0 @@
-package com.github.javafaker;
-
-public class ProgrammingLanguage {
-
-    private final Faker faker;
-
-    public ProgrammingLanguage(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String name() {
-        return faker.fakeValuesService().resolve("programming_language.name", this, faker);
-    }
-
-    public String creator() {
-        return faker.fakeValuesService().resolve("programming_language.creator", this, faker);
-    }
-
-}
@@ -1,60 +0,0 @@
-package com.github.javafaker;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.commons.lang3.ArrayUtils;
-
-public class Relationships {
-    private final Faker faker;
-
-    protected Relationships(final Faker faker) {
-        this.faker = faker;
-    }
-
-    public String direct() {
-        return faker.resolve("relationship.familial.direct");
-    }
-
-    public String extended() {
-        return faker.resolve("relationship.familial.extended");
-    }
-
-    public String inLaw() {
-        return faker.resolve("relationship.in_law");
-    }
-
-    public String spouse() {
-        return faker.resolve("relationship.spouse");
-    }
-
-    public String parent() {
-        return faker.resolve("relationship.parent");
-    }
-
-    public String sibling() {
-        return faker.resolve("relationship.sibling");
-    }
-
-    public String any() {
-        Method currentMethod = getClass().getEnclosingMethod();
-
-        try {
-            Method[] methods = Relationships.class.getDeclaredMethods();
-            methods = ArrayUtils.removeElement(methods, currentMethod);
-            int indx = faker.random().nextInt(methods.length);
-            Method runMethod = methods[indx];
-            Relationships relationships = new Relationships(faker);
-            return (String)runMethod.invoke(relationships);
-        } catch (SecurityException e) {
-            throw new RuntimeException("SecurityException: " + e.getMessage());
-        } catch (IllegalArgumentException e) {
-            throw new RuntimeException("IllegalArgumentException: " + e.getMessage());
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException("IllegalAccessException: " + e.getMessage());
-        } catch (InvocationTargetException e) {
-            throw new RuntimeException("InvocationTargetException: " + e.getMessage());
-        }
-    }
-
-}
@@ -14,8 +14,8 @@ public class EnIdNumber {
        String ssn = f.regexify("[0-8]\\d{2}-\\d{2}-\\d{4}");

        boolean isValid = true;
-        for (String invalidSSNPattern : invalidSSNPatterns) {
-            if (ssn.matches(invalidSSNPattern)) {
+        for (int i = 0; i < invalidSSNPatterns.length; i++) {
+            if (ssn.matches(invalidSSNPatterns[i])) {
                isValid = false;
                break;
            }
@@ -13,18 +13,18 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 public class FakeValuesService {
-
-    private static final Pattern EXPRESSION_PATTERN = Pattern.compile("#\\{([a-z0-9A-Z_.]+)\\s?((?:,?'([^']+)')*)\\}");
-    private static final Pattern EXPRESSION_ARGUMENTS_PATTERN = Pattern.compile("(?:'(.*?)')");
+    private static final Pattern EXPRESSION_PATTERN = Pattern.compile("#\\{([a-z0-9A-Z_.]+)\\s?(?:'([^']+)')?(?:,'([^']+)')*\\}");

    private final Logger log = Logger.getLogger("faker");

@@ -108,7 +108,7 @@ public class FakeValuesService {
     * with new Locale("pt","BR").
     */
    private Locale normalizeLocale(Locale locale) {
-        final String[] parts = locale.toString().split("[-_]");
+        final String[] parts = locale.toString().split("[-\\_]");

        if (parts.length == 1) {
            return new Locale(parts[0]);
@@ -347,11 +347,9 @@ public class FakeValuesService {
        while (matcher.find()) {
            final String escapedDirective = matcher.group(0);
            final String directive = matcher.group(1);
-            final String arguments = matcher.group(2);
-            final Matcher argsMatcher = EXPRESSION_ARGUMENTS_PATTERN.matcher(arguments);
            List<String> args = new ArrayList<String>();
-            while (argsMatcher.find()) {
-                args.add(argsMatcher.group(1));
+            for (int i = 2; i < matcher.groupCount() + 1 && matcher.group(i) != null; i++) {
+                args.add(matcher.group(i));
            }

            // resolve the expression and reprocess it to handle recursive templates
@@ -575,7 +573,7 @@ public class FakeValuesService {
     * this is useful as we get to find the method and coerce the arguments in one
     * shot, returning both when successful.  This saves us from doing it more than once (coercing args).
     */
-    private static class MethodAndCoercedArgs {
+    private class MethodAndCoercedArgs {

        private final Method method;

@@ -177,7 +177,6 @@ public class EnFile {

    // files where the search path can't be derived from the filename
    private static List<EnFile> FILES_WITH_A_DIFFERENT_PATH = Arrays.asList(
-            new EnFile("animal.yml", "creature"),
            new EnFile("cat.yml", "creature"),
            new EnFile("dog.yml", "creature"),
            new EnFile("league_of_legends.yml", "games"),
@@ -185,7 +184,6 @@ public class EnFile {
            new EnFile("pokemon.yml", "games"),
            new EnFile("witcher.yml", "games"),
            new EnFile("zelda.yml", "games"),
-            new EnFile("elder_scrolls.yml", "games"),
            new EnFile("phone_number.yml", "cell_phone")); // load phone number again with a differen path


@@ -65,10 +65,6 @@ de:
        - "#{half_wind_azimuth}"
        - "#{quarter_wind_azimuth}"

-    creature:
-      animal:
-        name: ["Aal", "Adler", "Affe", "Affe", "Alligator", "Alpaka", "Ameise", "Antilope", "Ara", "Auster", "Biber", "Biene", "Bisamratte", "Bär", "Büffel", "Chinchilla", "Dachs", "Delphin", "Dinosaurier", "Eichhörnchen", "Eidechse", "Elch", "Elch", "Elch", "Elefant", "Ente", "Esel", "Fisch", "Fledermaus", "Fliege", "Forelle", "Frettchen", "Frosch", "Fuchs", "Gans", "Gepard", "Giraffe", "Gnu", "Goldfisch", "Gorilla", "Grille", "Gürteltier", "Hai", "Hamster", "Hase", "Hering", "Heuschrecke", "Heuschrecke", "Hirsch", "Hornisse", "Hund", "Hyäne", "Igel", "Impala", "Jagdhund", "Kabeljau", "Kakerlake", "Kamel", "Kaninchen", "Karibu", "Katze", "Koala", "Kojote", "Krabbe", "Krokodil", "Krähe", "Kröte", "Käfer", "Känguru", "Lachs", "Lama", "Landschildkröte", "Laus", "Leopard", "Löwe", "Mammut", "Marder", "Maultier", "Maulwurf", "Maus", "Meerschweinchen", "Mops", "Muschel", "Mücke", "Mücke", "Nashorn", "Nerz", "Nilpferd", "Otter", "Panda", "Pavian", "Pferd", "Präriehund", "Qualle", "Rabe", "Ratte", "Rennmaus", "Rentier", "Rind", "Rind", "Robbe", "Sardine", "Schaf", "Schakal", "Schildkröte", "Schimpanse", "Schlange", "Schmetterling", "Schnabeltier", "Schnecke", "Schwan", "Schwein", "Schweinswal", "Seekuh", "Seelöwe", "Serval", "Skorpion", "Spinne", "Stachelschwein", "Stinktier", "Stockente", "Termite", "Tiger", "Wal", "Waldmurmeltier", "Wallaby", "Walross", "Waschbär", "Wasserbüffel", "Wespe", "Wespe", "Wiesel", "Wolf", "Wombat", "Wurm", "Yak", "Zebra", "Ziege", "Zikade"]
-
    internet:
      free_email: [gmail.com, yahoo.com, hotmail.com, gmx.de, web.de, mail.de, freenet.de]
      domain_suffix: [com, info, name, net, org, de, ch]
@@ -4,7 +4,7 @@ en-ZA:
      domain_suffix: [org.za, co.za, com]
    address:
      default_country: [South Africa, The Replublic of South Africa, SA]
-      post_code: '####'
+      postcode: '####'
      provinces: [Limpopo, Gauteng, Free State,
       North West, Northern Cape, Western Cape,
       KwaZulu-Natal, Mpumalanga, Eastern Cape]
@@ -19,7 +19,6 @@ en:
        AW: "Aruba"
        AU: "Australia"
        AT: "Austria"
-        AX: "Aland Islands"
        AZ: "Azerbaijan"
        BS: "Bahamas"
        BH: "Bahrain"
@@ -32,7 +31,6 @@ en:
        BM: "Bermuda"
        BT: "Bhutan"
        BO: "Bolivia"
-        BQ: 'Bonaire'
        BA: "Bosnia And Herzegovina"
        BW: "Botswana"
        BV: "Bouvet Island"
@@ -62,7 +60,6 @@ en:
        CI: "Cote D'ivoire"
        HR: "Croatia"
        CU: "Cuba"
-        CW: "Curacao"
        CY: "Cyprus"
        CZ: "Czech Republic"
        DK: "Denmark"
@@ -97,7 +94,6 @@ en:
        GP: "Guadeloupe"
        GU: "Guam"
        GT: "Guatemala"
-        GG: 'Guernsey'
        GN: "Guinea"
        GW: "Guinea-bissau"
        GY: "Guyana"
@@ -113,12 +109,10 @@ en:
        IR: "Iran, Islamic Republic Of"
        IQ: "Iraq"
        IE: "Ireland"
-        IM: "Isle of Man"
        IL: "Israel"
        IT: "Italy"
        JM: "Jamaica"
        JP: "Japan"
-        JE: "Jersey"
        JO: "Jordan"
        KZ: "Kazakstan"
        KE: "Kenya"
@@ -173,7 +167,7 @@ en:
        NU: "Niue"
        NF: "Norfolk Island"
        MP: "Northern Mariana Islands"
-        'NO': "Norway"
+        NO: "Norway"
        OM: "Oman"
        PK: "Pakistan"
        PW: "Palau"
@@ -192,11 +186,9 @@ en:
        RO: "Romania"
        RU: "Russian Federation"
        RW: "Rwanda"
-        BL: "Saint Barthelemy"
        SH: "Saint Helena"
        KN: "Saint Kitts And Nevis"
        LC: "Saint Lucia"
-        MF: "Saint Martin"
        PM: "Saint Pierre And Miquelon"
        VC: "Saint Vincent And The Grenadines"
        WS: "Samoa"
@@ -208,14 +200,12 @@ en:
        SC: "Seychelles"
        SL: "Sierra Leone"
        SG: "Singapore"
-        SX: "Sint Maarten"
        SK: "Slovakia"
        SI: "Slovenia"
        SB: "Solomon Islands"
        SO: "Somalia"
        ZA: "South Africa"
        GS: "South Georgia And The South Sandwich Islands"
-        SS: "South Sudan"
        ES: "Spain"
        LK: "Sri Lanka"
        SD: "Sudan"
@@ -229,7 +219,6 @@ en:
        TJ: "Tajikistan"
        TZ: "Tanzania, United Republic Of"
        TH: "Thailand"
-        TL: "Timor-Leste"
        TG: "Togo"
        TK: "Tokelau"
        TO: "Tonga"
@@ -397,6 +386,7 @@ en:
        mauritania: "MR"
        mauritius: "MU"
        mayotte: "YT"
+        mexicoMX: ""
        micronesia_federated_states_of: "FM"
        moldova_republic_of: "MD"
        monaco: "MC"
@@ -419,7 +409,7 @@ en:
        niue: "NU"
        norfolk_island: "NF"
        northern_mariana_islands: "NP"
-        norway: "NO"
+        norway: "NP"
        oman: "OM"
        pakistan: "PK"
        palau: "PW"
@@ -504,7 +494,7 @@ en:
      community_prefix: [Park, Summer, Autumn, Paradise, Eagle, Pine, Royal, University, Willow]
      community_suffix: [Village, Creek, Place, Pointe, Square, Oaks, Gardens, Crossing, Court, Acres, Estates, Heights]
      community:
-        - "#{community_prefix} #{community_suffix}"
+      - "#{community_prefix} #{community_suffix}"
      street_suffix: [Alley, Avenue, Branch, Bridge, Brook, Brooks, Burg, Burgs, Bypass, Camp, Canyon, Cape, Causeway, Center, Centers, Circle, Circles, Cliff, Cliffs, Club, Common, Corner, Corners, Course, Court, Courts, Cove, Coves, Creek, Crescent, Crest, Crossing, Crossroad, Curve, Dale, Dam, Divide, Drive, Drive, Drives, Estate, Estates, Expressway, Extension, Extensions, Fall, Falls, Ferry, Field, Fields, Flat, Flats, Ford, Fords, Forest, Forge, Forges, Fork, Forks, Fort, Freeway, Garden, Gardens, Gateway, Glen, Glens, Green, Greens, Grove, Groves, Harbor, Harbors, Haven, Heights, Highway, Hill, Hills, Hollow, Inlet, Inlet, Island, Island, Islands, Islands, Isle, Isle, Junction, Junctions, Key, Keys, Knoll, Knolls, Lake, Lakes, Land, Landing, Lane, Light, Lights, Loaf, Lock, Locks, Locks, Lodge, Lodge, Loop, Mall, Manor, Manors, Meadow, Meadows, Mews, Mill, Mills, Mission, Mission, Motorway, Mount, Mountain, Mountain, Mountains, Mountains, Neck, Orchard, Oval, Overpass, Park, Parks, Parkway, Parkways, Pass, Passage, Path, Pike, Pine, Pines, Place, Plain, Plains, Plains, Plaza, Plaza, Point, Points, Port, Port, Ports, Ports, Prairie, Prairie, Radial, Ramp, Ranch, Rapid, Rapids, Rest, Ridge, Ridges, River, Road, Road, Roads, Roads, Route, Row, Rue, Run, Shoal, Shoals, Shore, Shores, Skyway, Spring, Springs, Springs, Spur, Spurs, Square, Square, Squares, Squares, Station, Station, Stravenue, Stravenue, Stream, Stream, Street, Street, Streets, Summit, Summit, Terrace, Throughway, Trace, Track, Trafficway, Trail, Trail, Tunnel, Tunnel, Turnpike, Turnpike, Underpass, Union, Unions, Valley, Valleys, Via, Viaduct, View, Views, Village, Village, Villages, Ville, Vista, Vista, Walk, Walks, Wall, Way, Ways, Well, Wells]
      secondary_address: ['Apt. ###', 'Suite ###']
      # Though these are US-specific, they are here (in the default locale) for backwards compatibility
@@ -566,19 +556,20 @@ en:
      state_abbr: [AL, AK, AZ, AR, CA, CO, CT, DE, FL, GA, HI, ID, IL, IN, IA, KS, KY, LA, ME, MD, MA, MI, MN, MS, MO, MT, NE, NV, NH, NJ, NM, NY, NC, ND, OH, OK, OR, PA, RI, SC, SD, TN, TX, UT, VT, VA, WA, WV, WI, WY]
      time_zone: [Pacific/Midway, Pacific/Pago_Pago, Pacific/Honolulu, America/Juneau, America/Los_Angeles, America/Tijuana, America/Denver, America/Phoenix, America/Chihuahua, America/Mazatlan, America/Chicago, America/Regina, America/Mexico_City, America/Mexico_City, America/Monterrey, America/Guatemala, America/New_York, America/Indiana/Indianapolis, America/Bogota, America/Lima, America/Lima, America/Halifax, America/Caracas, America/La_Paz, America/Santiago, America/St_Johns, America/Sao_Paulo, America/Argentina/Buenos_Aires, America/Guyana, America/Godthab, Atlantic/South_Georgia, Atlantic/Azores, Atlantic/Cape_Verde, Europe/Dublin, Europe/London, Europe/Lisbon, Europe/London, Africa/Casablanca, Africa/Monrovia, Etc/UTC, Europe/Belgrade, Europe/Bratislava, Europe/Budapest, Europe/Ljubljana, Europe/Prague, Europe/Sarajevo, Europe/Skopje, Europe/Warsaw, Europe/Zagreb, Europe/Brussels, Europe/Copenhagen, Europe/Madrid, Europe/Paris, Europe/Amsterdam, Europe/Berlin, Europe/Berlin, Europe/Rome, Europe/Stockholm, Europe/Vienna, Africa/Algiers, Europe/Bucharest, Africa/Cairo, Europe/Helsinki, Europe/Kiev, Europe/Riga, Europe/Sofia, Europe/Tallinn, Europe/Vilnius, Europe/Athens, Europe/Istanbul, Europe/Minsk, Asia/Jerusalem, Africa/Harare, Africa/Johannesburg, Europe/Moscow, Europe/Moscow, Europe/Moscow, Asia/Kuwait, Asia/Riyadh, Africa/Nairobi, Asia/Baghdad, Asia/Tehran, Asia/Muscat, Asia/Muscat, Asia/Baku, Asia/Tbilisi, Asia/Yerevan, Asia/Kabul, Asia/Yekaterinburg, Asia/Karachi, Asia/Karachi, Asia/Tashkent, Asia/Kolkata, Asia/Kolkata, Asia/Kolkata, Asia/Kolkata, Asia/Kathmandu, Asia/Dhaka, Asia/Dhaka, Asia/Colombo, Asia/Almaty, Asia/Novosibirsk, Asia/Rangoon, Asia/Bangkok, Asia/Bangkok, Asia/Jakarta, Asia/Krasnoyarsk, Asia/Shanghai, Asia/Chongqing, Asia/Hong_Kong, Asia/Urumqi, Asia/Kuala_Lumpur, Asia/Singapore, Asia/Taipei, Australia/Perth, Asia/Irkutsk, Asia/Ulaanbaatar, Asia/Seoul, Asia/Tokyo, Asia/Tokyo, Asia/Tokyo, Asia/Yakutsk, Australia/Darwin, Australia/Adelaide, Australia/Melbourne, Australia/Melbourne, Australia/Sydney, Australia/Brisbane, Australia/Hobart, Asia/Vladivostok, Pacific/Guam, Pacific/Port_Moresby, Asia/Magadan, Asia/Magadan, Pacific/Noumea, Pacific/Fiji, Asia/Kamchatka, Pacific/Majuro, Pacific/Auckland, Pacific/Auckland, Pacific/Tongatapu, Pacific/Fakaofo, Pacific/Apia]
      city_name:
-        - "#{city}"
+      - "#{city}"
      city:
-        - "#{city_prefix} #{Name.first_name}#{city_suffix}"
-        - "#{city_prefix} #{Name.first_name}"
-        - "#{Name.first_name}#{city_suffix}"
-        - "#{Name.last_name}#{city_suffix}"
+      - "#{city_prefix} #{Name.first_name}#{city_suffix}"
+      - "#{city_prefix} #{Name.first_name}"
+      - "#{Name.first_name}#{city_suffix}"
+      - "#{Name.last_name}#{city_suffix}"
      street_prefix: "xx"
      street_name:
-        - "#{Name.first_name} #{street_suffix}"
-        - "#{Name.last_name} #{street_suffix}"
+      - "#{Name.first_name} #{street_suffix}"
+      - "#{Name.last_name} #{street_suffix}"
      street_address:
-        - "#{building_number} #{street_name}"
+      - "#{building_number} #{street_name}"
      full_address:
-        - "#{street_address}, #{city}, #{state_abbr} #{zip_code}"
-        - "#{secondary_address} #{street_address}, #{city}, #{state_abbr} #{zip_code}"
+      - "#{street_address}, #{city}, #{state_abbr} #{zip_code}"
+      - "#{secondary_address} #{street_address}, #{city}, #{state_abbr} #{zip_code}"
      default_country: [United States of America]
+
@@ -2,5 +2,5 @@ en:
  faker:
    creature:
      animal:
-        name: ["alligator", "crocodile", "alpaca", "ant", "antelope", "ape", "armadillo", "donkey", "baboon", "badger", "bat", "bear", "beaver", "bee", "beetle", "buffalo", "butterfly", "camel", "water buffalo", "caribou", "cat", "cattle", "cheetah", "chimpanzee", "chinchilla", "cicada", "clam", "cockroach", "cod", "coyote", "crab", "cricket", "crow",  "raven", "deer", "dinosaur", "dog", "dolphin", "porpoise", "duck", "eagle", "eel", "elephant", "elk", "ferret", "fish", "fly", "fox", "frog", "toad", "gerbil", "giraffe", "gnat", "gnu", "wildebeest", "goat", "goldfish", "goose", "gorilla", "grasshopper", "guinea pig", "hamster", "hare", "hedgehog", "herring", "hippopotamus", "hornet", "horse", "hound", "hyena", "impala", "jackal", "jellyfish", "kangaroo", "wallaby", "koala", "leopard", "lion", "lizard", "llama", "locust", "louse", "macaw", "mallard", "mammoth", "manatee", "marten", "mink", "minnow", "mole", "monkey", "moose", "mosquito", "mouse", "rat", "mule", "muskrat", "otter", "ox", "oyster", "panda", "pig", "platypus", "porcupine", "prairie dog", "pug", "rabbit", "raccoon", "reindeer", "rhinoceros", "salmon", "sardine", "scorpion", "seal", "sea lion", "serval", "shark", "sheep", "skunk", "snail", "snake", "spider", "squirrel", "swan", "termite", "tiger", "trout", "turtle ", "tortoise", "walrus", "wasp", "weasel", "whale", "wolf", "wombat", "woodchuck", "worm", "yak", "yellowjacket", "zebra"]
-
+        name: ["alligator", "crocodile", "alpaca", "ant", "antelope", "ape", "armadillo", "donkey", "baboon", "badger", "bat", "bear", "beaver", "bee", "beetle", "buffalo", "butterfly", "camel", "water buffalo", "caribou", "cat", "cattle", "cheetah", "chimpanzee", "chinchilla", "cicada", "clam", "cockroach", "cod", "coyote", "crab", "cricket", "crow",  "raven", "deer", "dinosaur", "dog", "dolphin", "porpoise", "duck", "eagle", "eel", "elephant", "elk", "ferret", "fish", "fly", "fox", "frog", "toad", "gerbil", "giraffe", "gnat", "gnu ", "wildebeest", "goat", "goldfish", "goose", "gorilla", "grasshopper", "guinea pig", "hamster", "hare", "hedgehog", "herring", "hippopotamus", "hornet", "horse", "hound", "hyena", "impala", "jackal", "jellyfish", "kangaroo ", "wallaby", "koala", "leopard", "lion", "lizard", "llama", "locust", "louse", "macaw", "mallard", "mammoth", "manatee", "marten", "mink", "minnow", "mole", "monkey", "moose", "mosquito", "mouse", "rat", "mule", "muskrat", "otter", "ox", "oyster", "panda", "pig", "platypus", "porcupine", "prairie dog", "pug", "rabbit", "raccoon", "reindeer", "rhinoceros", "salmon", "sardine", "scorpion", "seal ", "sea lion", "serval", "shark", "sheep", "skunk", "snail", "snake", "spider", "squirrel", "swan", "termite", "tiger", "trout", "turtle ", "tortoise", "walrus", "wasp", "weasel", "whale", "wolf", "wombat", "woodchuck", "worm", "yak", "yellowjacket", "zebra"]
+        
@@ -1,99 +0,0 @@
-en:
-  faker:
-    basketball:
-      teams:
-        - Atlanta Hawks
-        - Boston Celtics
-        - Brooklyn Nets
-        - Charlotte Hornets
-        - Chicago Bulls
-        - Cleveland Cavaliers
-        - Dallas Mavericks
-        - Denver Nuggets
-        - Detroit Pistons
-        - Golden State Warriors
-        - Houston Rockets
-        - Indiana Pacers
-        - Los Angeles Clippers
-        - Los Angeles Lakers
-        - Memphis Grizzlies
-        - Miami Heat
-        - Milwaukee Bucks
-        - Minnesota Timberwolves
-        - New Orleans Pelicans
-        - New York Knicks
-        - Oklahoma City Thunder
-        - Orlando Magic
-        - Philadelphia 76ers
-        - Phoenix Suns
-        - Portland Trail Blazers
-        - Sacramento Kings
-        - San Antonio Spurs
-        - Toronto Raptors
-        - Utah Jazz
-        - Washington Wizards
-      players:
-        - Kemba Walker
-        - Kyrie Irving
-        - Kawhi Leonard
-        - Giannis Antetokounmpo
-        - Joel Embiid
-        - Kyle Lowry
-        - Victor Oladipo
-        - Khris Middleton
-        - Bradley Beal
-        - Ben Simmons
-        - Blake Griffin
-        - Nikola Vučević
-        - Dwayne Wade
-        - D'Angelo Russell
-        - Stephen Curry
-        - James Harden
-        - Kevin Durant
-        - Paul George
-        - LeBron James
-        - Russell Westbrook
-        - Damian Lillard
-        - Klay Thompson
-        - Anthony Davis
-        - LaMarcus Aldridge
-        - Nikola Jokić
-        - Karl-Anthony Towns
-        - Dirk Nowitzki
-      coaches:
-        - Kenny Atkinson
-        - J.B. Bickerstaff
-        - James Borrego
-        - Jim Boylen
-        - Scott Brooks
-        - Brett Brown
-        - Mike Budenholzer
-        - Rick Carlisle
-        - Dwane Casey
-        - Steve Clifford
-        - Mike D'Antoni
-        - Billy Donovan
-        - Larry Drew
-        - David Fizdale
-        - Alvin Gentry
-        - Dave Joerger
-        - Steve Kerr
-        - Igor Kokoškov
-        - Michael Malone
-        - Nate McMillan
-        - Nick Nurse
-        - Lloyd Pierce
-        - Gregg Popovich
-        - Doc Rivers
-        - Ryan Saunders
-        - Quin Snyder
-        - Erik Spoelstra
-        - Brad Stevens
-        - Terry Stotts
-        - Luke Walton
-      positions:
-        - Point Guard
-        - Shooting Guard
-        - Small Forward
-        - Power Forward
-        - Center
@@ -1,8 +1,8 @@
 en:
  faker:
    beer:
-      brand: ['Corona Extra', 'Heineken', 'Budweiser', 'Becks', 'BudLight', 'Pabst Blue Ribbon', 'Dos Equis', 'Blue Moon', 'Stella Artois', 'Miller Draft', 'Coors lite' , 'Amstel', 'Guinness', 'Kirin', 'Tsingtao', 'Sierra Nevada', 'Rolling Rock', 'Red Stripe', 'Paulaner', 'Patagonia', 'Delirium', 'Samuel Adams', 'Sapporo', 'Carlsberg', 'Pacifico', 'Quimes', 'Murphys', 'Birra Moretti', 'Harp', 'Fosters', 'Hoegaarden', 'Leffe', 'Lowenbrau']
-      name: ['Pliny The Elder', 'Founders Kentucky Breakfast', 'Trappistes Rochefort 10', 'HopSlam Ale', 'Stone Imperial Russian Stout', 'St. Bernardus Abt 12', 'Founders Breakfast Stout', 'Weihenstephaner Hefeweissbier', 'Péché Mortel', 'Celebrator Doppelbock', 'Duvel', 'Dreadnaught IPA', 'Nugget Nectar', 'La Fin Du Monde', 'Bourbon County Stout', 'Old Rasputin Russian Imperial Stout', 'Two Hearted Ale', 'Ruination IPA', 'Schneider Aventinus', 'Double Bastard Ale', '90 Minute IPA', 'Hop Rod Rye', 'Trappistes Rochefort 8', 'Chimay Grande Réserve', 'Stone IPA', 'Arrogant Bastard Ale', 'Edmund Fitzgerald Porter', 'Chocolate St', 'Oak Aged Yeti Imperial Stout', 'Ten FIDY', 'Storm King Stout', 'Shakespeare Oatmeal', 'Alpha King Pale Ale', 'Westmalle Trappist Tripel', 'Samuel Smith’s Imperial IPA', 'Yeti Imperial Stout', 'Hennepin', 'Samuel Smith’s Oatmeal Stout', 'Brooklyn Black', 'Oaked Arrogant Bastard Ale', 'Sublimely Self-Righteous Ale', 'Trois Pistoles', 'Bell’s Expedition', 'Sierra Nevada Celebration Ale', 'Sierra Nevada Bigfoot Barleywine Style Ale', 'Racer 5 India Pale Ale, Bear Republic Bre', 'Orval Trappist Ale', 'Hercules Double IPA', 'Maharaj', 'Maudite', 'Kirin Inchiban', 'Delirium Tremens', 'Delirium Noctorum', 'Sapporo Premium']
+      brand: ['Corona Extra', 'Heineken', 'Budweiser', 'Becks', 'BudLight', 'Pabst Blue Ribbon', 'Dos Equis', 'Blue Moon', 'Stella Artois', 'Miller Draft', 'Coors lite' , 'Amstel', 'Guinness', 'Kirin Inchiban', 'Tsingtao', 'Sierra Nevada', 'Rolling Rock', 'Red Stripe', 'Paulaner', 'Patagonia', 'Delirium Tremens', 'Delirium Noctorum', 'Samuel Adams', 'Sapporo Premium', 'Carlsberg', 'Pacifico', 'Quimes', 'Murphys', 'Birra Moretti', 'Harp', 'Fosters', 'Hoegaarden', 'Leffe', 'Lowenbrau', 'Becks', 'Bitburger', 'Koenig Pilsener', 'Vitamalz', 'Schluessel Alt', 'Charlottenburger Pilsener', 'Brinkhoffs', 'Oettinger', 'Krombacher', 'Veltins', 'Warsteiner']
+      name: ['Pliny The Elder', 'Founders Kentucky Breakfast', 'Trappistes Rochefort 10', 'HopSlam Ale', 'Stone Imperial Russian Stout', 'St. Bernardus Abt 12', 'Founders Breakfast Stout', 'Weihenstephaner Hefeweissbier', 'Péché Mortel', 'Celebrator Doppelbock', 'Duvel', 'Dreadnaught IPA', 'Nugget Nectar', 'La Fin Du Monde', 'Bourbon County Stout', 'Old Rasputin Russian Imperial Stout', 'Two Hearted Ale', 'Ruination IPA', 'Schneider Aventinus', 'Double Bastard Ale', '90 Minute IPA', 'Hop Rod Rye', 'Trappistes Rochefort 8', 'Chimay Grande Réserve', 'Stone IPA', 'Arrogant Bastard Ale', 'Edmund Fitzgerald Porter', 'Chocolate St', 'Oak Aged Yeti Imperial Stout', 'Ten FIDY', 'Storm King Stout', 'Shakespeare Oatmeal', 'Alpha King Pale Ale', 'Westmalle Trappist Tripel', 'Samuel Smith’s Imperial IPA', 'Yeti Imperial Stout', 'Hennepin', 'Samuel Smith’s Oatmeal Stout', 'Brooklyn Black', 'Oaked Arrogant Bastard Ale', 'Sublimely Self-Righteous Ale', 'Trois Pistoles', 'Bell’s Expedition', 'Sierra Nevada Celebration Ale', 'Sierra Nevada Bigfoot Barleywine Style Ale', 'Racer 5 India Pale Ale, Bear Republic Bre', 'Orval Trappist Ale', 'Hercules Double IPA', 'Maharaj', 'Maudite']
      hop: ['Ahtanum', 'Amarillo', 'Bitter Gold', 'Bravo', 'Brewer’s Gold', 'Bullion', 'Cascade', 'Cashmere', 'Centennial', 'Chelan', 'Chinook', 'Citra', 'Cluster', 'Columbia', 'Columbus', 'Comet', 'Crystal', 'Equinox', 'Eroica', 'Fuggle', 'Galena', 'Glacier', 'Golding', 'Hallertau', 'Horizon', 'Liberty', 'Magnum', 'Millennium', 'Mosaic', 'Mt. Hood', 'Mt. Rainier', 'Newport', 'Northern Brewer', 'Nugget', 'Olympic', 'Palisade', 'Perle', 'Saaz', 'Santiam', 'Simcoe', 'Sorachi Ace', 'Sterling', 'Summit', 'Tahoma', 'Tettnang', 'TriplePearl', 'Ultra', 'Vanguard', 'Warrior', 'Willamette', 'Yakima Gol']
      yeast: ['1007 - German Ale', '1010 - American Wheat', '1028 - London Ale', '1056 - American Ale', '1084 - Irish Ale', '1098 - British Ale', '1099 - Whitbread Ale', '1187 - Ringwood Ale', '1272 - American Ale II', '1275 - Thames Valley Ale', '1318 - London Ale III', '1332 - Northwest Ale', '1335 - British Ale II', '1450 - Dennys Favorite 50', '1469 - West Yorkshire Ale', '1728 - Scottish Ale', '1968 - London ESB Ale', '2565 - Kölsch', '1214 - Belgian Abbey', '1388 - Belgian Strong Ale', '1762 - Belgian Abbey II', '3056 - Bavarian Wheat Blend', '3068 - Weihenstephan Weizen', '3278 - Belgian Lambic Blend', '3333 - German Wheat', '3463 - Forbidden Fruit', '3522 - Belgian Ardennes', '3638 - Bavarian Wheat', '3711 - French Saison', '3724 - Belgian Saison', '3763 - Roeselare Ale Blend', '3787 - Trappist High Gravity', '3942 - Belgian Wheat', '3944 - Belgian Witbier', '2000 - Budvar Lager', '2001 - Urquell Lager', '2007 - Pilsen Lager', '2035 - American Lager', '2042 - Danish Lager', '2112 - California Lager', '2124 - Bohemian Lager', '2206 - Bavarian Lager', '2278 - Czech Pils', '2308 - Munich Lager', '2633 - Octoberfest Lager Blend', '5112 - Brettanomyces bruxellensis', '5335 - Lactobacillus', '5526 - Brettanomyces lambicus', '5733 - Pediococcus']
      malt: ['Black malt', 'Caramel', 'Carapils', 'Chocolate', 'Munich', 'Caramel', 'Carapils', 'Chocolate malt', 'Munich', 'Pale', 'Roasted barley', 'Rye malt', 'Special roast', 'Victory', 'Vienna', 'Wheat mal']
@@ -10,4 +10,3 @@ en:
      categories: ["capsules", "concentrates", "crumble", "crystalline", "distillate", "edibles", "flower", "ice hash", "live resin", "medical", "rosin", "seeds & clones", "shatter", "tinctures", "topicals", "vape pens"]
      types: ["hybrid", "indica", "sativa"]
      buzzwords: ["blunt wrap", "bong", "bottom shelf", "bubbler", "cashed", "cbd", "dank", "eighth", "gram", "high", "hydroponic", "keef", "marijuana", "mary jane", "munchies", "ounce", "papers", "pipe", "pound", "private reserve", "ripped", "spliff", "stoned", "terpene", "thc", "toke", "top shelf", "wake and bake", "weed"]
-      brands: ["8 | FOLD Cultivation", "Apothecanna", "Auntie Dolores", "Big Pete's Treats", "Bloom Farms", "CI Wholesale", "California's Finest", "Cannapunch", "Cannavore Confections", "Caviar Gold", "Cheeba Chews", "Chong's Choice", "Claw", "Coda Signature", "Colorado Cannabis Company", "Dixie Edibles", "Dixie Elixirs", "Dosist", "Evolab", "Hashman Infused", "Hiku", "Jetty Extracts", "K.I.N.D. Concentrates", "Kiva Confections", "Leafs by Snoop", "Legal Drinks", "Level Blends", "Lola Lola", "Lord Jones", "Marley Natural", "Muy", "Nature’s Medicines", "Oil Stix", "Omaha Farms", "Orchid Essentials", "OreKron", "Roots", "Seven Point", "Shore Natural RX", "Siskiyou Sungrown", "Summit", "THC Design", "THC Factory", "The Goodship Company", "The Lab", "Timeless Vapes", "True Humboldt", "Wana Brands", "Whoopie & Maya", "Willie’s Reserve", "marQaha"]
@@ -7,5 +7,5 @@ en:
        material: [Steel, Wooden, Concrete, Plastic, Cotton, Granite, Rubber, Leather, Silk, Wool, Linen, Marble, Iron, Bronze, Copper, Aluminum, Paper]
        product: [Chair, Car, Computer, Gloves, Pants, Shirt, Table, Shoes, Hat, Plate, Knife, Bottle, Coat, Lamp, Keyboard, Bag, Bench, Clock, Watch, Wallet]
      promotion_code:
-        adjective: ['Amazing', 'Awesome', 'Cool', 'Good', 'Great', 'Incredible', 'Killer', 'Premium', 'Special', 'Stellar', 'Sweet']
-        noun: ['Code', 'Deal', 'Discount', 'Price', 'Promo', 'Promotion', 'Sale', 'Savings']
+        adjective: ['Amazing', 'Awesome', 'Cool', 'Good', 'Great', 'Incredible', 'Special', 'Surprising', 'Wonderful', 'Marvelous', 'Unbelievable', 'Stunning', 'Spectacular', 'Breathtaking', 'Exciting', 'Impressive', 'Overwhelming', 'Thrilling', 'First-Class']
+        noun: ['Code', 'Deal', 'Discount', 'Price', 'Promo', 'Promotion', 'Sale', 'Savings', 'Rebate', 'Bonus', 'Benefit', 'Bounty', 'Perk', 'Reward', 'Winning']
@@ -1,19 +1,6 @@
 en:
  faker:
    construction:
-      heavy_equipment: [
-        "Excavator",
-        "Backhoe",
-        "Bulldozer",
-        "Skid-Steer",
-        "Grader",
-        "Crawler",
-        "Trencher",
-        "Scraper",
-        "Dump Truck",
-        "Compactor",
-        "Dragline"
-      ]
      materials: [
        "Aluminum",
        "Brass",
@@ -74,352 +61,3 @@ en:
        "Wall Protection",
        "Waterproofing & Caulking"
      ]
-      roles: [
-        "Construction Manager",
-        "Estimator",
-        "Architect",
-        "Supervisor",
-        "Construction Expeditor",
-        "Construction Worker",
-        "Engineer",
-        "Electrician",
-        "Construction Foreman",
-        "Subcontractor",
-        "Project Manager",
-        "Surveyor"
-      ]
-      trades: [
-        "Boilermaker",
-        "Brickmason",
-        "Carpenter",
-        "Tile Setter",
-        "Cement Mason",
-        "Concrete Finisher",
-        "Terrazzo",
-        "Equipment Operator",
-        "Electrician",
-        "Glazier",
-        "Linemen",
-        "Painter",
-        "Pipelayer",
-        "Plumber",
-        "Plasterers",
-        "Stucco Mason",
-        "Sheet Metal Worker",
-        "Ironworker",
-        "Laborer",
-        "Millwright",
-        "Pipefitter",
-        "Waterproofer",
-        "Safety Officer",
-        "Welder",
-        "Refridgeration",
-        "HVAC",
-        "Landscaper"
-      ]
-      standard_cost_codes: [
-        "1 - General Requirements",
-        "1-000 - Purpose",
-        "1-002 - Instructions",
-        "1-010 - Project Manager",
-        "1-011 - Project Engineer",
-        "1-012 - Superintendent",
-        "1-013 - Project Coordinator",
-        "1-014 - Project Executive",
-        "1-500 - Temporary Facilities and Controls",
-        "1-510 - Temporary Utilities",
-        "1-511 - Temporary Electricity",
-        "1-514 - Temporary Heating, Cooling and Ventilation",
-        "1-515 - Temporary Lighting",
-        "1-517 - Temporary Telephone",
-        "1-518 - Temporary Water",
-        "1-520 - Construction Facilities",
-        "1-523 - Sanitary Facilities",
-        "1-530 - Temporary Construction",
-        "1-540 - Construction Aids",
-        "1-542 - Construction Scaffolding and Platforms",
-        "1-550 - Vehicular Access and Parking",
-        "1-560 - Temporary Barriers and Enclosures",
-        "1-570 - Temporary Controls",
-        "1-580 - Project Identification",
-        "1-600 - Product Requirements (Scope of Work)",
-        "1-630 - Product Substitution Procedures",
-        "1-640 - Owner Furnished Products",
-        "1-700 - Execution Requirements",
-        "1-712 - Local Conditions",
-        "1-740 - Cleaning",
-        "1-760 - Protecting Installed Construction",
-        "1-903 - Hazardous Materials Abatement",
-        "1-904 - Hazardous Materials Removal and Disposal",
-        "2 - Site Construction",
-        "2-000 - General",
-        "2-200 - Site Preparation",
-        "2-220 - Site Demolition",
-        "2-230 - Site Clearing",
-        "2-240 - Dewatering",
-        "2-250 - Shoring and Underpinning",
-        "2-260 - Excavation Support and Protection",
-        "2-300 - Earthwork",
-        "2-310 - Grading",
-        "2-311 - Final Grading",
-        "2-312 - Rough Grading",
-        "2-315 - Excavation",
-        "2-316 - Backfilling",
-        "2-317 - Select Borrow",
-        "2-320 - Excavation and Fill",
-        "2-362 - Termite Control",
-        "2-370 - Erosion and Sedimentation Control",
-        "2-500 - Utility Services",
-        "2-540 - Septic Tank",
-        "2-621 - Foundatation Drainage Piping",
-        "2-625 - Retaining Wall Drainage Piping",
-        "2-740 - Flexible Pavement Asphalt Pavement",
-        "2-750 - Concrete Pads and Walks",
-        "2-770 - Curb and Gutters",
-        "2-780 - Clay Unit Pavers",
-        "2-781 - Asphalt Pavers",
-        "2-782 - Brick Pavers",
-        "2-783 - Interlocking Concrete Unit Paving",
-        "2-784 - Stone Unit Pavers",
-        "2-790 - Athletic Surfacing",
-        "2-795 - Porous Paving",
-        "2-800 - Site Amenities",
-        "2-812 - Drip Irrigation",
-        "2-813 - Lawn Sprinkling and Irrigation",
-        "2-815 - Fountains",
-        "2-820 - Fences and Gates",
-        "2-821 - Chain Link Fences",
-        "2-822 - Ornamental Metal Fences and Gates",
-        "2-823 - PVC Fences and Gates",
-        "2-824 - Wire Fences and Gates",
-        "2-825 - Wood Fences and Gates",
-        "2-830 - Retaining Walls",
-        "2-850 - Bridges/Footbridges",
-        "2-870 - Sculpture/Ornamental",
-        "2-900 - Landscaping",
-        "2-915 - Mulch",
-        "2-917 - Soil Preparation",
-        "2-919 - Topsoil",
-        "2-923 - Seeding and Soil Supplements",
-        "2-924 - Sodding",
-        "2-930 - Exterior Plants",
-        "2-932 - PLants and Bulbs",
-        "2-935 - Plant Maintenance",
-        "2-936 - Fertilizer",
-        "3 - Concrete",
-        "3-000 - General",
-        "3-050 - Concrete Subcontractor",
-        "3-100 - Concrete Reinforcement",
-        "3-210 - Cast-In-Place Concrete",
-        "3-230 - Anchor Bolts",
-        "3-300 - Footings",
-        "3-310 - Expansion Joints",
-        "3-320 - Slab Foundations",
-        "3-330 - Poured Concrete Basement Walls",
-        "3-350 - Concrete Finishing",
-        "3-400 - Precast Concrete",
-        "3-500 - Cementitious Decks and Underlayments",
-        "3-540 - Cementitious Underlayments",
-        "3-600 - Grouts",
-        "4 - Masonry",
-        "4-050 - Basic Masonry Materials and Methods",
-        "4-200 - Masonry Units",
-        "4-400 - Stone",
-        "4-500 - Refractories",
-        "4-600 - Corrosion-Resistant Masonry",
-        "4-700 - Simulated Masonry",
-        "4-800 - Masonry Assemblies",
-        "4-900 - Masonry Restoration and Cleaning",
-        "5 - Metals",
-        "5-050 - Basic Metal Materials and Methods",
-        "5-100 - Structural Metals",
-        "5-200 - Metal Joists",
-        "5-300 - Metal Deck",
-        "5-400 - Cold-Formed Metal Framing",
-        "5-500 - Metal Fabrications",
-        "5-600 - Hydraulic Fabrications",
-        "5-700 - Ornamental Metal",
-        "5-800 - Expansion Control",
-        "5-900 - Metal Restoration and Cleaning",
-        "6 - Wood and Plastics",
-        "6-050 - Basic Wood and Plastic Materials and Methods",
-        "6-100 - Rough Carpentry",
-        "6-200 - Finish Carpentry",
-        "6-400 - Architectural Woodwork",
-        "6-500 - Structural Plastics",
-        "6-600 - Plastic Fabrications",
-        "6-900 - Wood and Plastic Restoration and Cleaning",
-        "7 - Thermal and Moisture Protection",
-        "7-050 - Basic Thermal and Moisture Protection Materials and Methods",
-        "7-100 - Damproofing and Waterproofing",
-        "7-200 - Thermal Protection - Insulation",
-        "7-300 - Shingles, Roof Tiles, and Roof Coverings",
-        "7-400 - Roofing and Siding Panels",
-        "7-500 - Membrane Roofing",
-        "7-600 - Flashing and Sheet Metal",
-        "7-700 - Roof Specialties and Accessories",
-        "7-800 - Fire and Smoke Protection",
-        "7-900 - Joint Sealers",
-        "8 - Doors and Windows",
-        "8-050 - Basic Door and Window Materials and Methods",
-        "8-100 - Doors",
-        "8-200 - Wood and Plastic Doors",
-        "8-300 - Specialty Doors",
-        "8-400 - Entrances and Storefronts",
-        "8-500 - Windows",
-        "8-600 - Skylights",
-        "8-700 - Hardware",
-        "8-800 - Glazing",
-        "8-900 - Glazed Curtain Wall",
-        "9 - Finishes",
-        "9-050 - Basic Finish Materials and Methods",
-        "9-100 - Metal Support Assemblies",
-        "9-250 - Gypsum Wallboard",
-        "9-300 - Tile",
-        "9-400 - Terrazzo",
-        "9-500 - Ceilings",
-        "9-600 - Flooring",
-        "9-680 - Carpet",
-        "9-700 - Wall Finishes",
-        "9-800 - Acoustical Treatment",
-        "9-900 - Paints and Coatings",
-        "10 - Specialties",
-        "10-100 - Visual Display Boards",
-        "10-150 - Compartments and Cubicles",
-        "10-200 - Louvers and Vents",
-        "10-240 - Grilles and Screens",
-        "10-250 - Service Walls",
-        "10-260 - Wall and Corner Guards",
-        "10-270 - Access Flooring",
-        "10-290 - Pest Control",
-        "10-300 - Fireplaces and Stoves",
-        "10-340 - Manufactured Exterior Specialties",
-        "10-350 - Flagpoles",
-        "10-400 - Identification Devices",
-        "10-450 - Pedestrian Control Devices",
-        "10-500 - Lockers",
-        "10-520 - Fire Protection Specialties",
-        "10-530 - Protective Covers",
-        "10-550 - Postal Specialties",
-        "10-600 - Partitions",
-        "10-670 - Storage Shelving",
-        "10-700 - Exterior Protection",
-        "10-750 - Telephone Specialties",
-        "10-800 - Toilet, Bath, and Laundry Specialties",
-        "10-820 - Bathroom Accessories",
-        "10-880 - Scales",
-        "10-900 - Wardrobe and Closet Specialties",
-        "11 - Equipment",
-        "11-010 - Maintenance Equipment",
-        "11-020 - Security and Vault Equipment",
-        "11-030 - Teller and Service Equipment",
-        "11-040 - Ecclesiastical Equipment",
-        "11-050 - Library Equipment",
-        "11-060 - Theater and Stage Equipment",
-        "11-070 - Instrumental Equipment",
-        "11-080 - Registration Equipment",
-        "11-090 - Checkroom Equipment",
-        "11-100 - Mercantile Equipment",
-        "11-110 - Commercial Laundry and Dry Cleaning Equipment",
-        "11-120 - Vending Equipment",
-        "11-130 - Audio-Visual Equipment",
-        "11-140 - Vehicle Service Equipment",
-        "11-150 - Parking Control Equipment",
-        "11-160 - Loading Dock Equipment",
-        "11-170 - Solid Waste Handling Equipment",
-        "11-190 - Detention Equipment",
-        "11-200 - Water Supply and Treatment Equipment",
-        "11-280 - Hydraulic Gates and Valves",
-        "11-300 - Fluid Waste Treatment and Disposal Equipment",
-        "11-400 - Food Service Equipment",
-        "11-450 - Residential Equipment",
-        "11-460 - Unit Kitchens",
-        "11-470 - Darkroom Equipment",
-        "11-480 - Athletic, Recreational, and Therapeutic Equipment",
-        "11-500 - Industrial and Process Equipment",
-        "11-600 - Laboratory Equipment",
-        "11-650 - Planetarium Equipment",
-        "11-660 - Observatory Equipment",
-        "11-680 - Office Equipment",
-        "11-700 - Medical Equipment",
-        "11-780 - Mortuary Equipment",
-        "11-850 - Navigation Equipment",
-        "11-870 - Agricultural Equipment",
-        "11-900 - Exhibit Equipment",
-        "12 - Furnishings",
-        "12-050 - Fabrics",
-        "12-100 - Art",
-        "12-300 - Manufactured Casework",
-        "12-400 - Furnishings and Accessories",
-        "12-500 - Furniture",
-        "12-600 - Multiple Seating",
-        "12-700 - Systems Furniture",
-        "12-800 - Interior Plants and Planters",
-        "12-900 - Furnishings Restoration and Repair",
-        "13 - Special Construction",
-        "13-010 - Air-Supported Structures",
-        "13-020 - Building Modules",
-        "13-030 - Special Purpose Rooms",
-        "13-080 - Sound, Vibration, and Seismic Control",
-        "13-090 - Radiation Protection",
-        "13-100 - Lightning Protection",
-        "13-110 - Cathodic Protection",
-        "13-120 - Pre-Engineered Structures",
-        "13-150 - Swimming Pools",
-        "13-160 - Aquariums",
-        "13-165 - Aquatic Park Facilities",
-        "13-170 - Tubs and Pools",
-        "13-175 - Ice Rinks",
-        "13-185 - Kennels and Animal Shelters",
-        "13-190 - Site-Constructed Incinerators",
-        "13-200 - Storage Tanks",
-        "13-220 - Filter Underdrains and Media",
-        "13-230 - Digester Covers and Appurtenances",
-        "13-240 - Oxygenation Systems",
-        "13-260 - Sludge Conditioning Systems",
-        "13-280 - Hazardous Material Remediation",
-        "13-400 - Measurement and Control Instrumentation",
-        "13-500 - Recording Instrumentation",
-        "13-550 - Transportation Control Instrumentation",
-        "13-600 - Solar and Wind Energy Equipment",
-        "13-700 - Security Access and Surveillance",
-        "13-800 - Building Automation and Control",
-        "13-850 - Detection and Alarm",
-        "13-900 - Fire Suppression",
-        "14 - Conveying Systems",
-        "14-100 - Dumbwaiters",
-        "14-200 - Elevators",
-        "14-300 - Escalators and Moving Walks",
-        "14-400 - Lifts",
-        "14-500 - Material Handling",
-        "14-600 - Hoists and Cables",
-        "14-700 - Turntables",
-        "14-800 - Scaffolding",
-        "14-900 - Transportation",
-        "15 - Mechanical",
-        "15-050 - Basic Mechanical Materials and Methods",
-        "15-100 - Plumbing",
-        "15-200 - Process Piping",
-        "15-300 - Fire Protection Piping",
-        "15-400 - Plumbing Fixtures and Equipment",
-        "15-500 - Heat-Generation Equipment",
-        "15-600 - Refrigeration Equipment",
-        "15-700 - Heating, Venting and Air Conditioning",
-        "15-800 - Air Distribution",
-        "15-900 - HVAC Instruments and Controls",
-        "15-950 - Testing, Adjusting, and Balancing",
-        "16 - Electrical",
-        "16-050 - Basic Electrical Materials and Methods",
-        "16-100 - Electrical",
-        "16-200 - Electrical Power",
-        "16-300 - Transmission and Distribution",
-        "16-400 - Low-Voltage Distribution",
-        "16-500 - Lighting",
-        "16-700 - Communications",
-        "16-800 - Sound and Video",
-        "17 - Markup and Contingency",
-        "17-010 - Contingency",
-        "17-020 - Insurance",
-        "17-030 - Bond",
-        "17-040 - Profit"
-      ]
@@ -1,25 +1,9 @@
 en:
  faker:
    crypto_coin:
-      coin:
-        - "Bitcoin,          BTC,  https://i.imgur.com/psBNOBq.png"
-        - "Bitcoin Cash,     BCC,  https://i.imgur.com/ViTjr9u.png"
-        - "Bitcoin Gold,     BTG,  https://i.imgur.com/l9cVE7c.png"
-        - "Bitcoin SV,       BSV,  https://i.imgur.com/DkixrAc.png"
-        - "Binance Coin,     BNB,  https://i.imgur.com/2HJr7OR.png"
-        - "Cardano,          ADA,  https://i.imgur.com/8qGU4zg.png"
-        - "Dash,             DASH, https://i.imgur.com/2uX91cb.png"
-        - "Decred,           DCR,  https://i.imgur.com/nURXAC2.png"
-        - "EOS.IO,           EOS,  https://i.imgur.com/Cr2w77s.png"
-        - "Ethereum,         ETH,  https://i.imgur.com/uOPFCXj.png"
-        - "Ethereum Classic, ETC,  https://i.imgur.com/8wBtmQA.png"
-        - "IOTA,             IOT,  https://i.imgur.com/DGFCOVt.png"
-        - "Litecoin,         LTC,  https://i.imgur.com/EFz61Ei.png"
-        - "Monero,           XMR,  https://i.imgur.com/pnupcJM.png"
-        - "NEM,              XEM,  https://i.imgur.com/SJ8NteF.png"
-        - "NEO,              NEO,  https://i.imgur.com/BmtVrJi.png"
-        - "Ripple,           XRP,  https://i.imgur.com/GjAPSsL.png"
-        - "Stellar,          XLM,  https://i.imgur.com/COLIHUE.png"
-        - "Tether,           USDT, https://i.imgur.com/xk6pQZy.png"
-        - "TRON,             TRX,  https://i.imgur.com/grG05ZK.png"
-        - "Zcash,            ZEC,  https://i.imgur.com/mX3r4j9.png"
+      coin: 
+        - "Bitcoin,   BTC,  https://i.imgur.com/psBNOBq.png"
+        - "Litecoin,  LTC,  https://i.imgur.com/EFz61Ei.png"
+        - "Dash,      DASH, https://i.imgur.com/2uX91cb.png"
+        - "Ethereum,  ETH,  https://i.imgur.com/uOPFCXj.png"
+        - "Ripple,    XRP,  https://i.imgur.com/GjAPSsL.png"
@@ -1,307 +0,0 @@
-en:
-  faker:
-    culture_series:
-      books:
-      - Consider Phlebas
-      - The Player of Games
-      - Use of Weapons
-      - The State of the Art
-      - Excession
-      - Inversions
-      - Look to Windward
-      - Matter
-      - Surface Detail
-      - The Hydrogen Sonata
-      culture_ships:
-      - Bora Horza Gobuchul
-      - Determinist
-      - Eschatologist
-      - Irregular Apocalypse
-      - No More Mr Nice Guy
-      - Profit Margin
-      - Nervous Energy
-      - Prosthetic Conscience
-      - Revisionist
-      - Trade Surplus
-      - The Ends Of Invention
-      - Cargo Cult
-      - Little Rascal
-      - So Much For Subtlety
-      - Unfortunate Conflict Of Evidence
-      - Youthful Indiscretion
-      - Flexible Demeanour
-      - Just Read The Instructions
-      - Of Course I Still Love You
-      - Zealot
-      - Limiting Factor
-      - Gunboat Diplomat
-      - Kiss My Ass
-      - Prime Mover
-      - Screw Loose
-      - Bad For Business
-      - Ablation
-      - Arbitrary
-      - Arrested Development
-      - A Series Of Unlikely Explanations
-      - A Ship With A View
-      - Big Sexy Beast
-      - Boo!
-      - Cantankerous
-      - Credibility Problem
-      - Dramatic Exit
-      - Excuses And Accusations
-      - Funny, It Worked Last Time...
-      - God Told Me To Do It
-      - Halation Effect
-      - Happy Idiot Talk
-      - Helpless In The Face Of Your Beauty
-      - Heresiarch
-      - I Thought He Was With You
-      - It'll Be Over By Christmas
-      - Just Another Victim Of The Ambient Morality
-      - Minority Report
-      - Never Talk To Strangers
-      - Not Wanted On Voyage
-      - Only Slightly Bent
-      - Perfidy
-      - Sacrificial Victim
-      - Space Monster
-      - Stranger Here Myself
-      - Synchronize Your Dogmas
-      - Thank You And Goodnight
-      - The Precise Nature Of The Catastrophe
-      - Ultimate Ship The Second
-      - Undesirable Alien
-      - Unwitting Accomplice
-      - Well I Was In The Neighbourhood
-      - You'll Thank Me Later
-      - You Would If You Really Loved Me
-      - Congenital Optimist
-      - Size Isn't Everything
-      - What Are The Civilian Applications?
-      - Just Testing
-      - Sweet and Full of Grace
-      - Very Little Gravitas Indeed
-      - Xenophobe
-      - Anticipation Of A New Lover's Arrival, The
-      - Death And Gravity
-      - Ethics Gradient
-      - Honest Mistake
-      - Limivorous
-      - Uninvited Guest
-      - Use Psychology
-      - What Is The Answer And Why?
-      - Wisdom Like Silence
-      - Yawning Angel
-      - Zero Gravitas
-      - Not Invented Here
-      - Misophist
-      - Serious Callers Only
-      - Steely Glint
-      - Different Tan
-      - Fate Amenable To Change
-      - It's Character Forming
-      - Jaundiced Outlook
-      - Problem Child
-      - Reasonable Excuse
-      - Recent Convert
-      - Tactical Grace
-      - Unacceptable Behaviour
-      - Attitude Adjuster
-      - Heavy Messing
-      - Killing Time
-      - Frank Exchange Of Views
-      - T3OU 4
-      - T3OU 118
-      - T3OU 736
-      - Charitable View
-      - Just Passing Through
-      - I Blame My Mother
-      - I Blame Your Mother
-      - Full Refund
-      - MBU 604
-      - Quietly Confident , later Sleeper Service
-      - No Fixed Abode
-      - Highpoint
-      - Shoot Them Later
-      - Appeal To Reason
-      - Break Even
-      - Long View
-      - Peace Makes Plenty
-      - Sober Counsel
-      - Within Reason
-      - Lasting Damage
-      - Lasting Damage I
-      - Lasting Damage II
-      - Sanctioned Parts List
-      - Grey Area
-      - Meatfucker
-      - Nuisance Value
-      - Resistance Is Character-Forming
-      - Vulgarian
-      - Someone Else's Problem
-      - Lacking That Small Match Temperament
-      - Poke It With A Stick
-      - I Said, I've Got A Big Stick
-      - Hand Me The Gun And Ask Me Again
-      - But Who's Counting?
-      - Germane Riposte
-      - We Haven't Met But You're A Great Fan Of Mine
-      - All The Same, I Saw It First
-      - Ravished By The Sheer Implausibility Of That Last Statement
-      - Zero Credibility
-      - Charming But Irrational
-      - Demented But Determined
-      - You May Not Be The Coolest Person Here
-      - Lucid Nonsense
-      - Awkward Customer
-      - Thorough But... Unreliable
-      - Advanced Case Of Chronic Patheticism
-      - Another Fine Product From The Nonsense Factory
-      - Conventional Wisdom
-      - In One Ear
-      - Fine Till You Came Along
-      - I Blame The Parents
-      - Inappropriate Response
-      - A Momentary Lapse Of Sanity
-      - Lapsed Pacifist
-      - Reformed Nice Guy
-      - Pride Comes Before A Fall
-      - Injury Time
-      - Now Look What You've Made Me Do
-      - Kiss This Then
-      - Seed Drill
-      - Don't Try This At Home
-      - Xenoglossicist
-      - Subtle Shift In Emphasis
-      - Experiencing A Significant Gravitas Shortfall
-      - It's My Party And I'll Sing If I Want To
-      - Lightly Seared On The Reality Grill
-      - Pure Big Mad Boat Man
-      - Qualifier
-      - Transient Atmospheric Phenomenon
-      - You Naughty Monsters
-      - Eight Rounds Rapid
-      - You'll Clean That Up Before You Leave
-      - Now We Try It My Way
-      - Liveware Problem
-      - Dressed Up To Party
-      - Pelagian
-      - Sense Amid Madness, Wit Amidst Folly
-      - Total Internal Reflection
-      - Armchair Traveller
-      - Bodhisattva , OAQS
-      - Falling Outside The Normal Moral Constraints
-      - No One Knows What The Dead Think
-      - Hylozoist
-      - The Usual But Etymologically Unsatisfactory
-      - Beastly To The Animals
-      - Fixed Grin
-      - Hidden Income
-      - Scar Glamour
-      - Labtebricolephile
-      - Me, I'm Counting
-      - A Fine Disregard For Awkward Facts
-      - Contents May Differ
-      - Empiricist
-      - Just The Washing Instruction Chip In Life's Rich Tapestry
-      - Kakistocrat
-      - Teething Problems
-      - Unreliable Witness
-      - Passing By And Thought I'd Drop In
-      - Pressure Drop
-      - You Call This Clean?
-      - Displacement Activity
-      - Warm, Considering
-      - Anything Legal Considered
-      - Beats Working
-      - Headcrash
-      - Questionable Ethics
-      - Xenocrat
-      - Caconym
-      - New Toy
-      - Rapid Random Response Unit
-      - Learned Response
-      - Outstanding Contribution To The Historical Process
-      - Refreshingly Unconcerned With The Vulgar Exigencies Of Veracity
-      - Value Judgement
-      - Zoologist
-      - Mistake Not...
-      - Smile Tolerantly
-      culture_ship_classes:
-      - General Systems Vehicle
-      - Medium Systems Vehicle
-      - Limited Systems Vehicle
-      - General Contact Vehicle
-      - General Contact Unit
-      - Limited Contact Unit
-      - Rapid Offensive Unit
-      - General Offensive Unit
-      - Limited Offensive Unit
-      - Demilitarised ROU
-      - Demilitarised GOU
-      - Demilitarised LOU
-      - Very Fast Picket
-      - Fast Picket
-      - Superlifter
-      culture_ship_class_abvs:
-      - GSV
-      - MSV
-      - LSV
-      - GCV
-      - GCU
-      - LCU
-      - ROU
-      - GOU
-      - LOU
-      - "(D)ROU"
-      - "(D)GOU"
-      - "(D)LOU"
-      - VFP
-      - FP
-      - SL
-      civs:
-      - "'Ktik"
-      - Affront
-      - Aultridia
-      - Azadian
-      - Birilisi
-      - Bithian
-      - Bulbitian
-      - Changer
-      - Chelgrian
-      - Culture
-      - Dra'azon
-      - Flekke
-      - Geseptian-Fardesile
-      - Gzilt
-      - Homomda
-      - Idiran
-      - Iln
-      - Involucra AKA Veil
-      - Jhlupe
-      - Medjel
-      - Liseiden
-      - Morthanveld
-      - Nariscene
-      - Nauptre
-      - Oct
-      - Pavulean
-      - Ronte
-      - Sichultia
-      - Tensile Xinthian Aeronathaur
-      - Xolpe
-      - Zihdra
-      planets:
-      - Bulthmaas
-      - Chel
-      - Eä
-      - Idir
-      - Issorile
-      - Narisca
-      - Nauptria
-      - Pavul
-      - Sichult
-      - Telaturier
-      - Xinth
-      - Zunzil Ligature
@@ -5,7 +5,7 @@ en:
      "Batman", "Superman", "Red Arrow", "Green Lantern", "Robin",
      "Nightwing", "The Flash", "Aquaman", "Green Arrow", "Captain Marvel",
      "Shazam", "Martain Manhunter", "Cyborg", "Hawkman", "Speedy", "Arsenal",
-      "Red Tornado", "Booster Gold", "Doctor Fate", "Beast Boy", "Plastic Man",
+      "Red Tornado","Booster Gold", "Doctor Fate", "Beast Boy", "Plastic Man",
      "Captain Atom", "Tempest", "Spectre", "Midnighter", "The Atom", "Kilowog",
      "Firestorm", "Blue Beetle", "Animal Man", "Mr. Miracle", "Wildcat",
      "Rorschach", "Dr. Manhattan", "Nite Owl", "The Comedian", "Azrael",
@@ -21,7 +21,7 @@ en:
      villain: [
      "The Joker", "Lex Luthor", "Darkseid", "Sinestro", "Brainiac", "Black Adam",
      "Ras al Ghul", "Deathstroke", "Two-Face", "Doomsday", "Catwoman", "Mongul",
-      "Bizarro", "Riddler", "Captain Cold", "Bane", "Harley Quinn", "Scarecrow",
+      "Bizaroo", "Riddler", "Captain Cold", "Bane", "Harley Quinn", "Scarecrow",
      "Paralax", "Gorilla Grodd", "General Zod", "Black Manta", "Mr. Freeze",
      "Cheetah", "Amanda Waller", "Penguin", "Poison Ivy", "Solomon Grundy",
      "Parasite", "Krona", "Deadshot", "Metallo", "Lobo", "Eclipso", "Ares",
@@ -39,14 +39,14 @@ en:
      ]
      title: [
      "The Sinestro Corps War", "The Coyote Gospel", "Green Arrow: The Longbow Hunters",
-      "JLA: Earth 2", "Identity Crisis", "JLA: Tower Of Babel", "Superman For All Seasons",
+      "Jla: Earth 2 ", "Identity Crisis", "Jla: Tower Of Babel", "Superman For All Seasons",
      "Superman: Red Son", "Batman: The Long Halloween", "Swamp Thing: The Anatomy Lesson",
-      "For The Man Who Has Everything", "Jack Kirby's New Gods",
+      "For The Man Who Has Everything", "Jack Kirby'S New Gods",
      "Arkham Asylum: A Serious House On Serious Earth", "Snowbirds Don't Fly",
      "Whatever Happened To The Man Of Tomorrow?", "The Killing Joke",
      "Teen Titans: The Judas Contract", "The New Frontier",
      "Kingdom Come", "Crisis On Infinite Earths",
      "Batman: Year One", "All Star Superman", "The Dark Knight Returns",
-      "Multiversity", "Gotham Central", "Grant Morrison's Animal Man",
+      "Multiversity", "Gotham Central", "Grant Morrison'S Animal Man",
      "Doom Patrol", "Action Comics", "Detective Comics"
      ]
@@ -10,3 +10,4 @@ en:
        coat_length: ["hairless", "short", "medium", "long", "wire", "curly"]
        size: ["small", "medium", "large", "extra large"]
        gender: ["female", "male"]
+
@@ -2,7 +2,7 @@ en:
  faker:
    games:
      dota:
-        hero: ["Abaddon", "Alchemist", "Axe", "Beastmaster", "Brewmaster", "Bristleback", "Centaur Warrunner", "Chaos Knight", "Clockwerk", "Meepo"]
+        hero: ["Abaddon", "Alchemist", "Axe", "Beastmaster", "Brewmaster", "Bristleback", "Centaur Warrunner", "Chaos Knight", "Clockwerk"]
        abaddon:
          quote: ["You have called death upon yourself.", "From House Avernus, I set forth.", "The mist chose me, it is not mine to command.", "To die at a noble hand is no guarantee of a noble death."]
        alchemist:
@@ -45,8 +45,6 @@ en:
          quote: ["A wolf in man's clothing.", "Who fears the wolf should fear the forest.", "A peaceful man is but a patient wolf."]
        magnus:
          quote: ["Under my hoof you will find your fate.", "My horn is sharp, my pike is sharper still.", "Compared to my horn, all precious items are cheap."]
-        meepo:
-          quote: ["Got dirt between my toes.", "One paw in front of the other!", "What's up Meepo?", "Have shovel, will bury. You.", "They should call you Ain't-Mage.", "You punched out all of my blood!", "Try that again, tough guy!"]
        night_stalker:
          quote: ["Day walker, night stalker.", "Devil by day, demon by night.", "Flesh sustains, gold remains.", "I feed the darkness and the darkness feeds me."]
        omniknight:
@@ -1,5 +1,5 @@
-en:
-  faker:
+en:  
+  faker: 
    games:
      elder_scrolls:
        race: ["Altmer", "Argonian", "Bosmer", "Breton", "Dunmer", "Dwemer", "Imperial", "Khajiit", "Nord", "Orc", "Redguard","Riekling"]
@@ -9,48 +9,3 @@ en:
        city: ["Solitude", "Winterhold", "Markarth", "Daggerfall", "Silvenar", "Tignus", "Lainlyn", "Dwyynen", "Glenpoint", "Whiterun", "Falkreath","Ykalon","Kozanset", "Kambria","Menevia", "Betony", "Northmoor", "Tulune", "Alcaire", "Verkarth", "Davon's Watch",    "Abah's Landing", "Clockwork City", "Wayrest", "Stormhold", "Sentinel", "Dawnstar", "Morthal","Riften","Windhelm","Dragon Bridge","Helgen", "Ivarstead", "Karthwasten", "Riverwood", "Rorikstead", "Shor's Stone"]
        first_name: ["Balgruuf", "Ralof", "Hadvar", "Irileth", "Gormlaith", "Farengar", "Felldir", "Hakon", "Iddra", "Malborn", "Tsun","Ysgramor", "Tsun", "Gerdur", "Dirge", "Orgnar", "Septimus", "Urag", "Brynjolf", "Faralda", "Vignar", "Elenwen", "Rulindil",  "Gissur", "Drahff", "Hewnon", "Gian", "Sulla", "Umana", "J'darr", "Astrid", "Nazir", "Maliq", "Babette",  "Gabriella", "Festus", "Arnbjorn", "Veezara", "Kodlak", "Aela", "Farkas", "Vilkas", "Skjor", "Athis", "Njada", "Ria", "Torvar", "Brill", "Eorlund", "Tilma", "Hestla", "Askar","Mercer", "Delvin", "Vex", "Tonilia", "Sapphire",  "Cynric", "Niruin", "Rune", "Thrynn", "Vipir", "Garthar", "Ravyn", "Etienne", "Molgrom", "Karliah", "Syndus",  "Vanryth", "Gulum-Ei", "Enthir", "Niranye", "Endon", "Mallus", "Athel", "Glover", "Erikur", "Ri'saad", "Atahbah",  "Ma'randru-jo", "Khayla", "Ahkari", "Zaynabi", "Dro'marash", "Kharjo", "Ma'dran", "Ma'jhad", "Ra'zhinda", "Mjoll",  "Brand-shei", "Inigo"]
        last_name: ["The Old", "The Greater", "The Lesser", "One-Eye", "Golden-Hilt", "Secret-Fire", "Septim", "Signus", "gro-Shub","Gray-Mane", "Black-Skeever", "The Fist", "Krex", "Whitemane", "Hunter", "Stonearm","The Haggard", "The Unbroken",   "The Man", "Ember-Master", "Battle-Born", "Black-Briar", "Lothaire", "Frey", "Mallory", "Endell", "The Fleet",   "Imyan", "Rarnis", "Twice-Killed", "Gatharian", "Maccius", "Newberry", "Cruel-Sea", "The Lion"]
-        quote: [
-          "You plod along, putting one foot before the other, look up, and suddenly, there you are. Right where you wanted to be all along.",
-          "Combatant from the blue team. You may leave the arena and rest now. You have earned it.",
-          "Sometimes life puts you in difficult circumstances you didn't choose. But being happy or unhappy is a choice you make, and I've chosen to make the best of things that I can.",
-          "My father taught me an important lesson many years ago. He said, 'Gwinlin, you have the whole world before you. Go out and experience it... be whatever you want to be.' So I took his advice, and here I am. This life might not look like much to you, but I'm content, and isn't that all that matters?",
-          "What is better: To be born good, or to overcome one's evil nature through great effort?",
-          "Wealth beyond measure, Outlander.",
-          "May your roads lead to warm sands.",
-          "I still don't know if there is a divine plan, but I've come to realize that it doesn't matter. What matters is that we act; that we do what's right when confronted with evil. That's what you did at Kvatch. It wasn't the gods that saved us, it was you.",
-          "What a fool you are. I'm a god! How can you kill a god? How could you be so naive? What a grand and intoxicating innocence. There is no escape. No recall or intervention works in this place. Come, lay down your weapons. It is not to late for my mercy.",
-          "Never should have come here.",
-          "The best techniques are passed on by the survivors.",
-          "The results of hard work and dedication always look like luck. But you know you've earned every ounce of your success.",
-          "Wake up. We're here. Why are you shaking? Are you okay? Wake up.",
-          "Not even last quarter's storm could wake you. I heard them say we've reached Adulthood, I'm sure they'll let us go.",
-          "Quiet, here comes the guard. You better do what they say.",
-          "Do you get to the cloud district very often?",
-          "Change will preserve us! It is the lifeblood of the world. It will move mountains! It will mount movements!",
-          "It's the grand champion! I can't believe it's you, standing here, next to me!",
-          "Why walk when you can ride?",
-          "Remember, your mind is the best weapon you have.",
-          "Brave hearts beat lesser ones. That's the decider.",
-          "Use Nature's gifts wisely. Respect her power, and fear her fury.",
-          "Treasure the gifts of friendship. Seek joy and inspiration in the mysteries of love.",
-          "Wait, I know you",
-          "Candy, candy -- he makes so much. Uncle Sweetshare has a magic touch! So it's back to the workshop in the snow! With lovely lanterns all aglow! He he! Ha ho! He he he ha ha ho!",
-          "Let me guess, somebody stole your sweetroll.",
-          "Can't wait to count out your coin!",
-          "You will find your own path. Take care... there will be blood and death before the end.",
-          "My ancestors are smiling at me, Imperials. Can you say the same?",
-          "KHAJIIT HAS WARES, IF YOU HAVE COIN",
-          "STOP RIGHT THERE YOU CRIMINAL SCUM!",
-          "Stupid bees and their stupid honey!",
-          "Have you heard of the high elves?",
-          "Sheggorath, you are the Skooma Cat, for what is crazier than a cat on skooma?",
-          "When we understand the events that occur to us, the events become history. History is understanding. Otherwise we are all just dumb animals trying to get in out of the cold.",
-          "Hey, there's my new pal! So what can I do for you? Need some items? Or maybe you ready to unload something? Whatever you need!",
-          "Children, listen as the shadows cross your sleeping hutch, And the village sleeps away, streets emptied of the crowds, And the moons do balefully glare through the nightly clouds, And the graveyard's people rest, we hope, in eternal sleep, Listen and you'll hear the whispered tap of the footsteps creep, Then pray you'll never feel the Worm King's awful touch.",
-          "He killed them! All of those people! We… we have to get him before he gets us! We have to kill that murdering swine!",
-          "Skooma! Oh yeah… You want to… want to be my friend? I'll… I'll tell you what… Skooma's the only thing… the only thing I want…",
-          "You impossible fool. What possessed you to think I would suggest a meeting here, of all places?",
-          "Some may call this junk, me, I call them treasures.",
-          "I'd be a lot happier and a lot warmer with a belly full of mead.",
-          "No lollygagin",
-          "I'm not a man, I'm a weapon in human form."]
@@ -1,283 +0,0 @@
-en:
-  faker:
-    game:
-      title:
-        - 'Half-Life'
-        - 'Half-Life: Opposing Force'
-        - 'Half-Life: Blue Shift'
-        - 'Half-Life 2'
-        - 'Half-Life 2: Episode One'
-        - 'Half-Life 2: Episode Two'
-        - 'Half-Life 2: Lost Coast'
-        - 'Portal'
-        - 'Portal 2'
-        - 'Team Fortress Classic'
-        - 'Team Fortress 2'
-        - 'Left 4 Dead'
-        - 'Left 4 Dead 2'
-        - 'Day of Defeat'
-        - 'Ricochet'
-        - 'Dota 2'
-        - 'Counter-Strike'
-        - 'Counter-Strike: Source'
-        - 'Counter-Strike: Global Offensive'
-        - "Garry's Mod"
-        - 'Super Mario Bros.'
-        - 'Super Mario Bros. 2'
-        - 'Super Mario Bros. 3'
-        - 'Super Mario World'
-        - 'Super Mario Sunshine'
-        - 'Super Mario Galaxy'
-        - 'Super Mario Galaxy 2'
-        - 'Super Mario Odyssey'
-        - 'Mario Kart 64'
-        - 'Mario Kart: Double Dash'
-        - 'Mario Kart DS'
-        - 'Mario Kart Wii'
-        - 'Mario Kart 7'
-        - 'Mario Kart 8'
-        - 'Mario Kart 8 Deluxe'
-        - "Luigi's Mansion"
-        - 'Animal Crossing'
-        - 'Animal Crossing: Wild World'
-        - 'Animal Crossing: City Folk'
-        - 'Animal Crossing: New Leaf'
-        - 'Civilization III'
-        - 'Civilization IV'
-        - 'Civilization V'
-        - 'Civilization VI'
-        - 'The Legend of Zelda'
-        - 'The Legend of Zelda: Ocarina of Time'
-        - "The Legend of Zelda: Majora's Mask"
-        - 'The Legend of Zelda: Twilight Princess'
-        - 'The Legend of Zelda: Skyward Sword'
-        - 'The Legend of Zelda: Breath of the Wild'
-        - 'Pong'
-        - 'Pac-Man'
-        - 'Starcraft'
-        - 'Starcraft II'
-        - 'Overwatch'
-        - 'Hearthstone'
-        - 'Halo: Combat Evolved'
-        - 'Halo 2'
-        - 'Halo 3'
-        - 'Halo 3: ODST'
-        - 'Halo: Reach'
-        - 'Halo 4'
-        - 'Halo 5: Guardians'
-        - 'Wii Sports'
-        - 'Wii Sports Resort'
-        - 'Wii Play'
-        - 'Wii Music'
-        - 'Pokémon Red'
-        - 'Pokémon Blue'
-        - 'Pokémon Yellow'
-        - 'Pokémon Gold'
-        - 'Pokémon Silver'
-        - 'Pokémon Crystal'
-        - 'Pokémon Ruby'
-        - 'Pokémon Sapphire'
-        - 'Pokémon FireRed'
-        - 'Pokémon LeafGreen'
-        - 'Pokémon Emerald'
-        - 'Pokémon Diamond'
-        - 'Pokémon Pearl'
-        - 'Pokémon Platinum'
-        - 'Pokémon HeartGold'
-        - 'Pokémon SoulSilver'
-        - 'Pokémon Black'
-        - 'Pokémon White'
-        - 'Pokémon Black 2'
-        - 'Pokémon White 2'
-        - 'Pokémon X'
-        - 'Pokémon Y'
-        - 'Pokémon Omega Ruby'
-        - 'Pokémon Alpha Sapphire'
-        - 'Pokémon Sun'
-        - 'Pokémon Moon'
-        - 'Pokémon Ultra Sun'
-        - 'Pokémon Ultra Moon'
-        - "Pokémon: Let's Go Pikachu!"
-        - "Pokémon: Let's Go Eevee!"
-        - 'Pokémon Sword'
-        - 'Pokémon Shield'
-        - 'Doom'
-        - 'Doom II'
-        - 'Doom 3: BFG'
-        - 'Quake'
-        - 'Wolfenstein 3D'
-        - 'Wolfenstein: The New Order'
-        - 'Wolfenstein: The Old Blood'
-        - 'Wolfenstein 2: The New Colossus'
-        - 'Puyo Puyo Tetris'
-        - 'Katamari Damacy'
-        - 'Bastion'
-        - 'Transistor'
-        - 'System Shock'
-        - 'BioShock'
-        - 'BioShock Infinite'
-        - 'Deus Ex'
-        - 'Metroid Prime'
-        - 'Metroid Prime 2: Echoes'
-        - 'Metroid Prime 3: Corruption'
-        - 'Super Meat Boy'
-        - 'Super Smash Bros. Brawl'
-        - 'Super Smash Bros. Melee'
-        - 'Super Smash Bros. Ultimate'
-        - 'Thief II'
-        - 'Vampire: The Masquerade – Bloodlines'
-        - 'Myst'
-        - 'Batman: Arkham Asylum'
-        - 'Batman: Arkham City'
-        - 'Dishonored'
-        - 'God of War'
-        - 'LittleBigPlanet'
-        - 'Grim Fandango'
-        - 'Day of the Tentacle'
-        - 'Kingdom Hearts'
-        - 'Kingdom Hearts II'
-        - 'The Last of Us'
-        - 'Perfect Dark'
-        - 'Shadow of the Colossus'
-        - 'Fallout: New Vegas'
-        - 'Fire Emblem Awakening'
-        - "Banjo-Kazooie: Grunty's Revenge"
-        - 'Banjo-Kazooie: Nuts & Bolts'
-        - 'Firewatch'
-        - 'Mass Effect'
-        - 'Mass Effect 2'
-        - 'Mass Effect 3'
-        - 'Mega Man'
-        - 'Mega Man Battle Network'
-        - 'Bayonetta'
-        - 'Bayonetta 2'
-        - 'The Wonderful 101'
-        - 'Sleeping Dogs'
-        - 'Battletoads'
-        - 'Brütal Legend'
-        - 'Halo Wars'
-        - 'Clannad'
-        - 'Highway Blossoms'
-        - 'Infamous'
-        - 'Crash Bandicoot'
-        - 'Just Cause'
-        - 'Just Cause 2'
-        - 'Devil May Cry'
-        - 'Life is Strange'
-        - 'WarioWare: Smooth Moves'
-        - 'WarioWare: Touched!'
-        - 'Dwarf Fortress'
-        - 'Dungeon Keeper'
-        - 'Minecraft'
-        - 'Fortnite'
-        - "PlayerUnknown's Battlegrounds"
-        - "Kirby's Adventure"
-        - "Kirby's Dream Land"
-        - "Kirby's Epic Yarn"
-        - "Yoshi's Wooly World"
-        - 'L.A. Noire'
-        - 'Kid Icarus'
-        - 'Ice Climbers'
-        - 'Crysis'
-        - 'Crysis 2'
-        - 'Hitman: Absolution'
-        - 'Metal Gear Solid'
-        - 'F-Zero'
-        - 'F.E.A.R.'
-        - 'Max Payne'
-        - 'Max Payne 2: The Fall of Max Payne'
-        - 'Max Payne 3'
-        - 'Far Cry'
-        - 'Castle Crashers'
-        - 'Sonic Unleashed'
-        - "Mirror's Edge"
-        - 'The Witcher'
-        - 'The Witcher 2: Assassins of Kings'
-        - 'The Witcher 3: Wild Hunt'
-        - 'Monster Hunter: World'
-        - 'Call of Duty'
-        - 'Call of Duty 4: Modern Warfare'
-        - 'Call of Duty: Modern Warfare Remastered'
-        - 'Call of Duty: Modern Warfare 2'
-        - 'Call of Duty: Modern Warfare 3'
-        - 'Call of Duty: World at War'
-        - 'Call of Duty: Black Ops'
-        - 'Call of Duty: Black Ops II'
-        - 'Call of Duty: Black Ops III'
-        - 'Call of Duty: Black Ops 4'
-        - 'Shadow Tactics: Blade of the Shogun'
-        - 'Commandos: Behind Enemy Lines'
-        - 'Commandos: Beyond the Call of Duty'
-        - 'Commandos 2: Men of Courage'
-        - 'Commandos 3: Destination Berlin'
-        - 'Commandos: Strike Force'
-        - 'Desperados: Wanted Dead or Alive'
-        - "Desperados 2: Cooper's Revenge"
-        - 'Helldorado'
-        - 'Desperados III'
-        - 'Diablo'
-        - 'Diablo II'
-        - 'Diablo III'
-        - 'Guitar Hero'
-      genre:
-        - 'First-person shooter'
-        - 'Puzzle'
-        - 'Platformer'
-        - 'Action'
-        - 'Adventure'
-        - 'Real-time strategy'
-        - 'Action role-playing'
-        - 'Dungeon crawl'
-        - 'Roguelike'
-        - 'Tactical role-playing'
-        - 'Sports'
-        - 'Simulation'
-        - 'Fighting'
-        - 'Massively multiplayer online'
-        - 'Stealth'
-        - 'Survival'
-        - 'Rhythm'
-        - 'Survival horror'
-        - 'Text adventure'
-        - 'Visual novel'
-        - 'Real-time strategy'
-        - 'Multiplayer online battle arena'
-        - 'Tower defense'
-        - 'Trivia'
-        - 'Real-time tactics'
-        - 'Hack and slash'
-        - 'Battle royale'
-        - 'Third-person shooter'
-        - 'Music'
-      platform:
-        - 'Xbox'
-        - 'Xbox 360'
-        - 'Xbox One'
-        - 'PlayStation'
-        - 'PlayStation 2'
-        - 'PlayStation 3'
-        - 'PlayStation 4'
-        - 'PlayStation Portable'
-        - 'PlayStation Vita'
-        - 'Game Boy'
-        - 'Game Boy Color'
-        - 'Game Boy Advance'
-        - 'Nintendo DS'
-        - 'Nintendo DSi'
-        - 'Nintendo 3DS'
-        - 'Nintendo Entertainment System'
-        - 'Super Nintendo Entertainment System'
-        - 'Nintendo 64'
-        - 'GameCube'
-        - 'Wii'
-        - 'Wii U'
-        - 'Nintendo Switch'
-        - 'Windows'
-        - 'macOS'
-        - 'Linux'
-        - 'Sega Genesis'
-        - 'Sega Master System'
-        - 'Game Gear'
-        - 'Sega Saturn'
-        - 'Sega Dreamcast'
-        - 'Virtual Boy'
@@ -44,5 +44,4 @@ en:
              "The Music Never Stopped",
              "Black Muddy River",
              "Looks Like Rain",
-              "Bird Song",
-              "Cassidy"]
+              "Bird Song"]
@@ -2,6 +2,6 @@ en:
  faker:
    heroes_of_the_storm:
      battlegrounds: ["Alterac Pass", "Battlefield of Eternity", "Blackheart's Bay", "Braxis Holdout", "Cursed Hollow", "Dragon Shire", "Garden of Terror", "Hanamura Temple", "Haunted Mines", "Infernal Shrines", "Sky Temple", "Tomb of the Spider Queen", "Towers of Doom", "Volskaya Foundry", "Warhead Junction"]
-      classes: ["Bruiser", "Healer", "Melee Assassin", "Ranged Assassin", "Support", "Tank"]
-      heroes: ["Abathur", "Alarak", "Alexstrasza", "Ana", "Anduin", "Anub'arak", "Artanis", "Arthas", "Auriel", "Azmodan", "Blaze", "Brightwing", "Cassia", "Chen", "Cho", "Chromie", "D.Va", "Deckard", "Dehaka", "Diablo", "E.T.C.", "Falstad", "Fenix", "Gall", "Garrosh", "Gazlowe", "Genji", "Greymane", "Gul'dan", "Hanzo", "Illidan", "Imperius", "Jaina", "Johanna", "Junkrat", "Kael'thas", "Kel'Thuzad", "Kerrigan", "Kharazim", "Leoric", "Li Li", "Li-Ming", "Lt. Morales", "Lunara", "Lúcio", "Maiev", "Mal'Ganis", "Malfurion", "Malthael", "Medivh", "Mephisto", "Muradin", "Murky", "Nazeebo", "Nova", "Orphea", "Probius", "Ragnaros", "Raynor", "Rehgar", "Rexxar", "Samuro", "Sgt. Hammer", "Sonya", "Stitches", "Stukov", "Sylvanas", "Tassadar", "The Butcher", "The Lost Vikings", "Thrall", "Tracer", "Tychus", "Tyrael", "Tyrande", "Uther", "Valeera", "Valla", "Whitemane", "Xul", "Yrel", "Zagara", "Zarya", "Zeratul", "Zul'jin"]
+      classes: ["Assasin", "Multiclass", "Specialist", "Support", "Warrior"]
+      heroes: ["Abathur", "Alarak", "Alexstrasza", "Ana", "Anub'arak", "Artanis", "Arthas", "Auriel", "Azmodan", "Blaze", "Brightwing", "Cassia", "Chen", "Cho", "Chromie", "D.Va", "Deckard", "Dehaka", "Diablo", "E.T.C.", "Falstad", "Fenix", "Gall", "Garrosh", "Gazlowe", "Genji", "Greymane", "Gul'dan", "Hanzo", "Illidan", "Jaina", "Johanna", "Junkrat", "Kael'thas", "Kel'Thuzad", "Kerrigan", "Kharazim", "Leoric", "Li Li", "Li-Ming", "Lt. Morales", "Lunara", "Lúcio", "Maiev", "Mal'Ganis", "Malfurion", "Malthael", "Medivh", "Mephisto", "Muradin", "Murky", "Nazeebo", "Nova", "Orphea", "Probius", "Ragnaros", "Raynor", "Rehgar", "Rexxar", "Samuro", "Sgt. Hammer", "Sonya", "Stitches", "Stukov", "Sylvanas", "Tassadar", "The Butcher", "The Lost Vikings", "Thrall", "Tracer", "Tychus", "Tyrael", "Tyrande", "Uther", "Valeera", "Valla", "Whitemane", "Xul", "Yrel", "Zagara", "Zarya", "Zeratul", "Zul'jin"]
      quotes: ["Beat them like they owe you money!", "Careful wizard, your kind has upset the balance beforeo I become re-dead? Deader? ... Alive?\"", "Don't forget to check the pocket!", "Have you ever considered aiming anywhere other than the face?", "Hey, you look like the cover of E.T.C.s new album!", "Human words are hard to make together talking for expressing... things!", "I like happy things! Like puppies, and rainbows, and dead enemies!", "I must leave and I blame this failure upon you.", "Mrgrgrlrgrlgr!!!", "Oh my God, I can't believe I just killed a panda.", "Taunting life form; you are weak! And physically unappealing!", "Teammates. Much to improve.\" is a pretty good contender.", "That was easy! You were easy to kill!", "This will only hurt until you die.", "Ugh, I've known much better healers.", "We drink first blood!", "You look like you could actually be of use here!", "You might be a king, or just a street sweeper... yet sooner or later you dance with the reaper.", "You see this hero yes? Then kill them!", "You think us fools?", "You waste both my time and your breath, and the former has value."]
@@ -26,7 +26,7 @@ en:
      "Victon", "Vromance", "A.C.E", "Be.A", "Dream Catcher", "Duetto", "ELRIS", "Favorite", "Fromis", "Golden Child", "Good Day", "Gugudan Ogu-ogu",
      "Hash Tag", "HONEYST", "Highlight", "IN2IT", "IZ", "JBJ", "K.A.R.D", "Longguo & Shihyun", "MVP", "MXM", "MYTEEN", "NU'EST W", "ONF", "P.O.P",
      "Pristin", "Rainz", "S.I.S", "Seven O'Clock", "The Boyz", "Top Secret", "TRCNG", "Triple H", "Wanna One", "Weki Meki"]
-      girl_groups: ["2NB", "2NE1", "2Yoon", "4L ", "4Minute", "4Ten", "15&", "After School ", "AOA", "AOA Black", "AOA Cream", "Apink", "April",
+      girl_groups: [2NB", "2NE1", "2Yoon", "4L ", "4Minute", "4Ten", "15&", "After School ", "AOA", "AOA Black", "AOA Cream", "Apink", "April",
      "As One", "Baby Vox", "Baby Vox Re.V", "Badkiz", "Bambino", "The Barberettes", "Berry Good", "Bestie", "Big Mama",
      "Black Pearl", "Blackpink", "Blady", "Bob Girls", "Bolbbalgan4", "BP Rania", "Brave Girls", "Brown Eyed Girls", "C-REAL ", "Chakra",
      "Chocolat", "CLC", "Cleo", "Cosmic Girls", "Crayon Pop", "Cupid ", "D-Unit", "D.Holic", "Dal Shabet", "Davichi", "Dia", "Diva",
@@ -2,9 +2,9 @@ en:
  faker:
    games:
      league_of_legends:
-        champion: ["Aatrox", "Ahri", "Akali", "Alister", "Amumu", "Anivia", "Annie", "Ashe", "Aurelion Sol", "Azir", "Bard", "Blitzcrank", "Brand", "Braum", "Caitlyn", "Camille", "Cassiopeia", "Cho-Gath", "Corki", "Darius", "Diana", "Dr. Mundo", "Draven", "Ekko", "Elise", "Evelynn", "Ezreal", "Fiddlesticks", "Fiora", "Fizz", "Galio", "Gangplank", "Garen", "Gnar", "Gragas", "Graves", "Hecarim", "Heimerdinger", "Illaoi", "Irelia", "Ivern", "Janna", "Jarvan IV", "Jax", "Jayce", "Jhin", "Jinx", "Kai'Sa", "Kalista", "Karma", "Karthus", "Kassadin", "Katarina", "Kayle", "Kayn", "Kennen", "Kha'Zix", "Kindred", "Kled", "Kog'Maw", "LeBlanc", "Lee Sin", "Leona", "Lissandra", "Lucian", "Lulu", "Lux", "Malphite", "Malzahar", "Maokai", "Master Yi", "Miss Fortune", "Mordekaiser", "Morgana", "Neeko", "Nami", "Nasus", "Nautilus", "Nidalee", "Nocturne", "Nunu & Willump", "Olaf", "Orianna", "Ornn", "Pantheon", "Poppy", "Pyke", "Quinn", "Rammus", "Rek'Sai", "Renekton", "Rengar", "Riven", "Rakan", "Rumble", "Ryze", "Sejuani", "Shaco", "Shen", "Shyvanna", "Singed", "Sion", "Sivir", "Skarner", "Sona", "Soraka", "Swain", "Sylas", "Syndra", "Tahm Kench", "Taliyah", "Talon", "Taric", "Teemo", "Thresh", "Tristana", "Trundle", "Tryndamere", "Twisted Fate", "Twitch", "Udyr", "Urgot", "Varus", "Vayne", "Veigar", "Vel'Koz", "Vi", "Viktor", "Vladimir", "Volibear", "Warwick", "Wukong", "Xayah", "Xerath", "Xin Zhao", "Yasuo", "Yorick", "Yuumi", "Zac", "Zed", "Ziggs", "Zilean", "Zoe", "Zyra"]
+        champion: ["Aatrox", "Ahri", "Akali", "Alister", "Amumu", "Anivia", "Annie", "Ashe", "Aurelion Sol", "Azir", "Bard", "Blitzcrank", "Brand", "Braum", "Caitlyn", "Camille", "Cassiopeia", "Cho-Gath", "Corki", "Darius", "Diana", "Dr. Mundo", "Draven", "Ekko", "Elise", "Evelynn", "Ezreal", "Fiddlesticks", "Fiora", "Fizz", "Galio", "Gangplank", "Garen", "Gnar", "Gragas", "Graves", "Hecarim", "Heimerdinger", "Illaoi", "Irelia", "Ivern", "Janna", "Jarvan IV", "Jax", "Jayce", "Jhin", "Jinx", "Kalista", "Karma", "Karthus", "Kassadin", "Katarina", "Kayle", "Kennen", "Kha'Zix", "Kindred", "Kled", "Kog'Maw", "LeBlanc", "Lee Sin", "Leona", "Lissandra", "Lucian", "Lulu", "Lux", "Malphite", "Malzahar", "Maokai", "Master Yi", "Miss Fortune", "Mordekaiser", "Morgana", "Nami", "Nasus", "Nautilus", "Nidalee", "Nocturne", "Nunu", "Olaf", "Orianna", "Pantheon", "Poppy", "Quinn", "Rammus", "Rek'Sai", "Renekton", "Rengar", "Riven", "Rakan", "Rumble", "Ryze", "Sejuani", "Shaco", "Shen", "Shyvanna", "Singed", "Sion", "Sivir", "Skarner", "Sona", "Soraka", "Swain", "Syndra", "Tahm Kench", "Taliyah", "Talon", "Taric", "Teemo", "Thresh", "Tristana", "Trundle", "Tryndamere", "Twisted Fate", "Twitch", "Udyr", "Urgot", "Varus", "Vayne", "Veigar", "Vel'Koz", "Vi", "Viktor", "Vladimir", "Volibear", "Warwick", "Wukong", "Xayah", "Xerath", "Xin Zhao", "Yasuo", "Yorick", "Zac", "Zed", "Ziggs", "Zilean", "Zyra"]
        location: ["Demacia", "Noxus", "Shadow Isles", "Valoran", "Runeterra", "Bandle City", "Bilgewater", "Freljord", "Ionia", "Mount Targon", "Piltover", "Lokfar", "Zaun"]
        quote: ["Purge the unjust.", "By my will, this shall be finished!", "You only have to click once, fool!", "My right arm is a lot stronger than my left.", "Ready to set the world on fire...", "The early bird guts the worm!", "Don't you trust me?", "Welcome to Summoners Rift!", "Have you seen my Bear Tibbers?", "NOM NOM NOM", "Defy Noxus and taste your own blood.", "Behold the might of the shadow isles.", "Who wants a piece of the champ?!", "Come on, live a little... while you can!", "Master yourself, master the enemy.", "Blindness is no impairment against a smelly enemy.", "ok.", "Caught between a rock... and a hard place.", "Mundo will go where he pleases!", "Mundo say his own name a lot, or else he forget! Has happened before.", "A man, a woman and a yordle walk into the sun. They die! Because it burns them alive? heh heh heh heh", "The cycle of life and death continues. We will live, they will die.", "My profession?! You know, now that I think of it, I've always wanted to be a baker.", "Tonight we hunt!", "Monsters can be made to fear.", "How about a drink?", "Captain Teemo on duty.", "Hut, two, three, four. Yes, sir!", "I'll scout ahead!", "That's gotta sting.", "Never underestimate the power of the Scout's code.", "I suppose you're expecting some inBEARable pun?", "It's not how much you can lift. It's how good you look!", "Welcome to the League of Draven.", "Not Draven; Draaaaven.", "Who wants some Draven? Heheheh.", "Subtle? I don't do subtle."]
        summoner_spell: ["Teleport", "Exhaust", "Barrier", "Smite", "Flash", "Ignite", "Clarity", "Mark", "To the King!", "Ghost", "Heal", "Poro Toss", "Cleanse"]
        masteries: ["Battle Trance", "Double Edged Sword", "Bounty Hunter", "Fresh Blood", "Expose Weakness", "Feast", "Warlord's Bloodlust", "Fervor of Battle", "Deathfire Touch", "Greenfather's Gift", "Dangerous Game", "Bandit", "Courage of the Colossus", "Stoneborn Pact", "Grasp of the Undying", "Siegemaster", "Tough Skin", "Explorer", "Assassin", "Secret Stash", "Runic Affinity", "Windspeaker's Blessing", "Thunderlord's Decree", "Stormraider's Surge", "Fearless", "Unyielding", "Meditation", "Battering Blows", "Piercing Thoughts", "Insight", "Perseverance", "Intelligence", "Precision", "Sorcery", "Vampirism", "Fury", "Natural Talent", "Savagery", "Wanderer", "Merciless", "Recovery", "Legendary Guardian", "Swiftness", "Runic Armor", "Veteran's Scars"]
-        rank: ["Iron IV", "Iron III", "Iron II", "Iron I", "Bronze IV", "Bronze III", "Bronze II", "Bronze I", "Silver IV", "Silver III", "Silver II", "Silver I", "Gold IV", "Gold III", "Gold II", "Gold I", "Platinum IV", "Platinum III", "Platinum II", "Platinum I", "Diamond IV", "Diamond III", "Diamond II", "Diamond I", "Master", "Grandmaster", "Challenger"]
+        rank: ["Bronze V", "Bronze IV", "Bronze III", "Bronze II", "Bronze I", "Silver V", "Silver IV", "Silver III", "Silver II", "Silver I", "Gold V", "Gold IV", "Gold III", "Gold II", "Gold I", "Platinum V", "Platinum IV", "Platinum III", "Platinum II", "Platinum I", "Diamond V", "Diamond IV", "Diamond III", "Diamond II", "Diamond I", "Master", "Challenger"]
@@ -26,7 +26,7 @@ en:
      "The Eminem Show", "Hybrid Theory", "Come Away with Me", "Unplugged", "True Blue", "Legend: The Best of Bob Marley & The Wailers", "Tapestry", "No Jacket Required", "Greatest Hits",
      "Bridge over Troubled Water", "The Joshua Tree", "...Baby One More Time", "Backstreet's Back", "Backstreet Boys", "Millennium", "Spice", "Happy Nation", "The Sign", "Whitney Houston",
      "(What's the Story) Morning Glory?", "The Marshall Mathers LP", "Like a Virgin", "Cross Road", "25", "Boston", "Oops!... I Did It Again", "The Colour of My Love", "Hysteria", "Faith",
-      "Dookie", "Can't Slow Down", "Daydream", "HIStory: Past, Present and Future, Book I", "Off the Wall", "The Woman in Me", "Breakfast in America", "Tracy Chapman",
+      "Dookie", "Can't Slow Down", "Daydream", "HIStory: Past", " Present and Future", " Book I", "Off the Wall", "The Woman in Me", "Breakfast in America", "Tracy Chapman",
      "Flashdance: Original Soundtrack from the Motion Picture", "Whitney", "Confessions", "X&Y", "High School Musical", "High School Musical 2", "Viva la Vida or Death and All His Friends",
      "I Dreamed a Dream", "Recovery", "Midnight Memories", "Frozen", "Lemonade", "Brand New Eyes", "All We Know Is Falling", "Riot!", "Songs About Jane", "Hands All Over"]
      genres: ["Rock", "Pop", "Electronic", "Folk", "World", "Country", "Jazz", "Funk", "Soul", "Hip Hop", "Classical", "Latin", "Reggae", "Stage And Screen", "Blues", "Non Music", "Rap"]
@@ -26,5 +26,4 @@ en:
      title:
        descriptor: [Lead, Senior, Direct, Corporate, Dynamic, Future, Product, National, Regional, District, Central, Global, Customer, Investor, Dynamic, International, Legacy, Forward, Internal, Human, Chief, Principal]
        level: [Solutions, Program, Brand, Security, Research, Marketing, Directives, Implementation, Integration, Functionality, Response, Paradigm, Tactics, Identity, Markets, Group, Division, Applications, Optimization, Operations, Infrastructure, Intranet, Communications, Web, Branding, Quality, Assurance, Mobility, Accounts, Data, Creative, Configuration, Accountability, Interactions, Factors, Usability, Metrics]
-        job: [Supervisor, Associate, Executive, Liaison, Officer, Manager, Engineer, Specialist, Director, Coordinator, Administrator, Architect, Analyst, Designer, Planner, Orchestrator, Technician, Developer, Producer, Consultant, Assistant, Facilitator, Agent, Representative, Strategist]
-      blood_group: [O-, O+, A-, A+, B-, B+, AB-, AB+]
+        job: [Supervisor, Associate, Executive, Liaison, Officer, Manager, Engineer, Specialist, Director, Coordinator, Administrator, Architect, Analyst, Designer, Planner, Orchestrator, Technician, Developer, Producer, Consultant, Assistant, Facilitator, Agent, Representative, Strategist]
@@ -1,172 +0,0 @@
-en:
-  faker:
-    opera:
-      italian:
-        by_giuseppe_verdi:
-          - Oberto Conte di San Bonifacio
-          - Un Giorno di Regno
-          - Nabucco
-          - Lombardi alla Prima Crociata
-          - Ernani
-          - I due Foscari
-          - Giovanna d'Arco
-          - Alzira
-          - Attila
-          - Macbeth
-          - I Masnadieri
-          - Jérusalem
-          - Il Corsaro
-          - La Battaglia di Legnano
-          - Luisa Miller
-          - Stiffelio
-          - Rigoletto
-          - Il Trovatore
-          - Simon Boccanegra
-          - Aroldo
-          - Un Ballo in Maschera
-          - La Forza del Destino
-          - Don Carlos
-          - Aida
-          - Otello
-          - Falstaff
-          - I Vespri Siciliani
-          - La Traviat
-        by_gioacchino_rossini:
-          - Demetrio e Polibio
-          - La cambiale di matrimonio
-          - L'equivoco stravagante
-          - L'inganno felice
-          - Ciro in Babilonia ossia La caduta di Baldassare
-          - La scala di seta
-          - La pietra del paragone
-          - L'occasione fa il ladro  ossia Il cambio della valigia
-          - Il signor Bruschino   ossia Il figlio per azzardo
-          - Tancredi
-          - L'italiana in Algeri
-          - Aureliano in Palmira
-          - Il turco in Italia
-          - Sigismondo
-          - Elisabetta   regina d'Inghilterra
-          - Torvaldo e Dorliska
-          - Il barbiere di Siviglia   ossia L'inutile precauzione
-          - La gazzetta   ossia Il matrimonio per concorso
-          - Otello   ossia Il Moro di Venezia
-          - La Cenerentola   ossia La bontà in trionfo
-          - La gazza ladra
-          - Armida
-          - Adelaide di Borgogna ossia Ottone re d'Italia
-          - Mosè in Egitto
-          - Adina ossia Il califfo di Bagdad
-          - Ricciardo e Zoraide
-          - Ermione
-          - Eduardo e Cristina
-          - La donna del lago
-          - Bianca e Falliero ossia Il consiglio dei tre
-          - Maometto II
-          - Matilde di Shabran
-          - Zelmira
-          - Semiramide
-          - Ugo   re d'Italia
-          - Il viaggio a Reims   ossia L'albergo del Giglio d'Oro
-          - Le siège de Corinthe
-          - Moïse et Pharaon ou Le passage de la mer rouge
-          - Le comte Ory
-          - Guillaume Tell
-        by_gaetano_donizetti:
-          - Olimpiade
-          - L'ira di Achille
-          - Enrico di Borgogna
-          - Una follia
-          - I piccioli virtuosi ambulanti
-          - Il falegname di Livonia o Pietro il grande czar delle Russie
-          - Le nozze in villa
-          - Zoraida di Granata
-          - La zingara
-          - La lettera anonima
-          - Chiara e Serafina o Il pirata
-          - Alfredo il grande
-          - Il fortunato inganno
-          - L'ajo nell'imbarazzo
-          - Emilia di Liverpool or L'eremitaggio di Liverpool
-          - Alahor in Granata
-          - Don Gregorio
-          - Elvida
-          - Gabriella di Vergy
-          - Olivo e Pasquale
-          - Otto mesi in due ore ossia Gli esiliati in Siberia
-          - Il borgomastro di Saardam
-          - Le convenienze teatrali
-          - L'esule di Roma ossia Il proscritto
-          - L'eremitaggio di Liverpool
-          - Alina regina di Golconda
-          - Gianni di Calais
-          - Il paria
-          - Il giovedì grasso o Il nuovo Pourceaugnac
-          - Elisabetta al castello di Kenilworth
-          - Alina regina di Golconda[rev]
-          - I pazzi per progetto
-          - Il diluvio universale
-          - Imelda de' Lambertazzi
-          - Anna Bolena
-          - Gianni di Parigi
-          - Le convenienze ed inconvenienze teatrali
-          - Francesca di Foix
-          - La romanziera e l'uomo nero
-          - Fausta
-          - Ugo conte di Parigi
-          - L'elisir d'amore
-          - Sancia di Castiglia
-          - Il furioso all'isola di San Domingo
-          - Otto mesi in due ore
-          - Parisina
-          - Torquato Tasso
-          - Lucrezia Borgia
-          - Il diluvio universale
-          - Rosmonda d'Inghilterra
-          - Maria Stuarda
-          - Buondelmonte
-          - Gemma di Vergy
-          - Marino Faliero
-          - Lucia di Lammermoor
-          - Belisario
-          - Il campanello di notte
-          - Betly o La capanna svizzera
-          - L'assedio di Calais
-          - Pia de' Tolomei
-          - Pia de' Tolomei
-          - Betly
-          - Roberto Devereux
-          - Maria de Rudenz
-          - Gabriella di Vergy
-          - Poliuto
-          - Pia de' Tolomei
-          - Lucie de Lammermoor
-          - Le duc d'Albe
-          - L'ange de Nisida
-          - Lucrezia Borgia
-          - Les Martyrs
-          - La fille du régiment
-          - Lucrezia Borgia
-          - La favorite
-          - Adelia
-          - Rita
-          - Maria Padilla
-          - Linda di Chamounix
-          - Caterina Cornaro
-          - Don Pasquale
-          - Maria di Rohan
-          - Dom Sébastien roi de Portugal
-          - Dom Sebastian von Portugal
-          - Il duca d'Alba
-        by_vincenzo_bellini:
-          - Adelson e Salvini
-          - Bianca e Gernando
-          - Il pirata
-          - Bianca e Fernando
-          - La straniera
-          - Zaira
-          - I Capuleti e i Montecchi
-          - La sonnambula
-          - Norma
-          - Beatrice di Tenda
-          - I puritani
@@ -68,58 +68,28 @@ en:
        "Valentina",
        "Farrah Moan",
        "Aja",
-        "Cynthia Lee Fontaine",
-        "Aquaria",
-        "Eureka",
-        "Kameron Michaels",
-        "Asia O'Hara",
-        "Miz Cracker",
-        "Monet X Change",
-        "The Vixen",
-        "Monique Heart",
-        "Blair St. Clair",
-        "Mayhem Miller",
-        "A'keria Chanel Davenport",
-        "Ariel Versace",
-        "Brook Lynn Hytes",
-        "Mercedes Iman Diamond",
-        "Nina West",
-        "Plastique Tiara",
-        "Ra'jah O'Hara",
-        "Scarlet Envy",
-        "Shuga Cain",
-        "Silky Nutmeg Ganache",
-        "Vanessa Vanjie Mateo",
-        "Yvie Oddly"
+        "Cynthia Lee Fontaine"
      ]
      quotes: [
       "Glamazon!",
-       "Put the bass in your walk.",
-       "Sashay away.",
-       "Good luck, and don't fuck it up.",
-       "Shante, you stay.",
-       "You betta work.",
-       "The time has come, for you to lip-sync for your life!",
-       "Extravaganza eleganza!",
-       "Now, let the music play!",
-       "That's funny, tell another one.",
-       "Sissy that walk.",
-       "Don't be jealous of my boogie.",
-       "We're all born naked and the rest is drag.",
-       "Life is about using the whole box of crayons.",
-       "When the going gets tough, the tough reinvent themselves.",
-       "Hello, hello, hello!",
-       "Bring back my girls.",
-       "Just between us squirrel friends...",
-       "In the great tradition of Paris is Burning, \"Get out your Library Cards!\"",
-       "Because reading is what?",
-       "Now listen, I gotta tell ya...",
-       "Silence...I've made my decision.",
-       "You're a winner, baby!",
-       "Condragulations!",
-       "I'm sorry, my dear, but you are up for elimination.",
-       "Prance, I say!",
-       "If you can't love yourself, how in the hell you gonna love somebody else?",
-       "Must be jelly 'cause jam don't shake.",
-       "She done already done had herses."
+       "Put The Bass In Your Walk",
+       "Sashay Away",
+       "Don't F*ck It Up",
+       "Shante, You Stay",
+       "Shante, Shante, Shante",
+       "You Betta Work",
+       "Lip-Sync for Your Life",
+       "Extravaganza Eleganza",
+       "Let the music play",
+       "That's Funny, Tell Another One",
+       "Sissy That Walk",
+       "Don't Be Jealous Of My Boogie",
+       "You're Born Naked, The Rest Is Drag",
+       "Life Is About Using The Whole Box Of Crayons",
+       "When The Going Gets Tough, The Tough Reinvent",
+       "Hello Hello Hello!",
+       "Bring Back My Girls",
+       "Just Between Us Squirrel Friends",
+       "Get Out Your Library Cards",
+       "Silence...I've made my decision",
      ]
@@ -6,12 +6,12 @@ en:
      galaxy: ['Milky Way', 'Andromeda', 'Triangulum', 'Whirlpool', 'Blackeye', 'Sunflower', 'Pinwheel', 'Hoags Object', 'Centaurus A', 'Messier 83']
      nebula: ['Lagoon Nebula', 'Eagle Nebula', 'Triffid Nebula', 'Dumbell Nebula', 'Orion Nebula', 'Ring Nebula', 'Bodes Nebula', 'Owl Nebula']
      star_cluster: ['Wild Duck', 'Hyades', 'Coma', 'Butterfly', 'Messier 7', 'Pleiades', 'Beehive Cluster', 'Pearl Cluster', 'Hodge 301', 'Jewel Box Cluster', 'Wishing Well Cluster', 'Diamond Cluster', 'Trumpler 10', 'Collinder 140', 'Liller 1', 'Koposov II', 'Koposov I', 'Djorgovski 1', 'Arp-Madore 1', 'NGC 6144', 'NGC 2808', 'NGC 1783', 'Messier 107', 'Messier 70', 'Omega Centauri', 'Palomar 12', 'Palomar 4', 'Palomar 6', 'Pyxis Cluster', 'Segue 3']
-      constellation: ['Big Dipper', 'Litte Dipper', 'Orion', 'Leo', 'Gemini', 'Cancer', 'Canis Minor', 'Canis Major', 'Ursa Major', 'Ursa Minor', 'Virgo', 'Libra', 'Scorpius', 'Sagittarius', 'Lyra', 'Capricornus', 'Aquarius', 'Pisces', 'Aries', 'Leo Minor', 'Auriga']
+      constellation: ['Big Dipper', 'Litte Dipper', 'Orion', 'Loe', 'Gemini', 'Cancer', 'Canis Minor', 'Canis Major', 'Ursa Major', 'Ursa Minor', 'Virgo', 'Libra', 'Scorpius', 'Sagittarius', 'Lyra', 'Capricornus', 'Aquarius', 'Pisces', 'Aries', 'Leo Minor', 'Auriga']
      star: ['Sun', 'Proxima Centauri', 'Rigil Kentaurus', 'Barnards Star', 'Wolf 359', 'Luyten 726-8A', 'Luyten 726-8B', 'Sirius A', 'Sirius B', 'Ross 154', 'Ross 248', 'Procyon A', 'Procyon B', 'Vega', 'Rigel', 'Arcturus', 'Betelgeuse', 'Mahasim', 'Polaris']
      agency: ['National Aeronautics and Space Administration', 'European Space Agency', 'German Aerospace Center', 'Indian Space Research Organization', 'China National Space Administration', 'UK Space Agency', 'Brazilian Space Agency', 'Mexican Space Agency', 'Israeli Space Agency', 'Italian Space Agency', 'Japan Aerospace Exploration Agency', 'National Space Agency of Ukraine', 'Russian Federal Space Agency', 'Swedish National Space Board']
      agency_abv: ['NASA', 'AEM', 'AEB', 'UKSA', 'CSA', 'CNSA', 'ESA', 'DLR', 'ISRO', 'JAXA', 'ISA', 'CNES', 'NSAU', 'ROSCOSMOS', 'SNSB']
      nasa_space_craft: ['Orion', 'Mercury', 'Gemini', 'Apollo', 'Enterprise', 'Columbia', 'Challenger', 'Discovery', 'Atlantis', 'Endeavour']
-      company: ['Rocket Lab', 'SpaceX', 'Blue Origin', 'Virgin Galactic', 'SpaceDev', 'Bigelow Aerospace', 'Orbital Sciences', 'JPL', 'NASA Jet Propulsion Laboratory']
+      company: ['Rocket Lab', SpaceX', 'Blue Origin', 'Virgin Galactic', 'SpaceDev', 'Bigelow Aerospace', 'Orbital Sciences', 'JPL', 'NASA Jet Propulsion Laboratory']
      distance_measurement: ['light years', 'AU', 'parsecs', 'kiloparsecs', 'megaparsecs']
      meteorite: ['Aarhus', 'Abee', 'Adelie Land', 'Adhi Kot', 'Adzhi-Bogdo', 'Santa Rosa de Viterbo', 'Agen', 'Akbarpur', 'Albareto', 'Allan Hills 84001', 'Allan Hills A81005', 'Allegan', 'Allende', 'Ambapur Nagla', 'Andura', 'Angers', 'Angra dos Reis', 'Ankober', 'Anlong', 'Annaheim', 'Appley Bridge', 'Arbol Solo', 'Archie', 'Arroyo Aguiar', 'Assisi', 'Atoka', 'Avanhandava', 'Bacubirito', 'Baszkówka','Beardsley', 'Bellsbank', 'Bench Crater', 'Benton', 'Białystok', 'Blithfield','Block Island', 'Bovedy', 'Brachina', 'Brahin', 'Brenham', 'Buzzard Coulee','Campo del Cielo', 'Canyon Diablo', 'Cape York', 'Carancas', 'Chambord','Chassigny', 'Chelyabinsk', 'Chergach', 'Chinga', 'Chinguetti', 'Claxton','Coahuila', 'Cranbourne', 'D''Orbigny', 'Dronino', 'Eagle Station', 'Elbogen','Ensisheim', 'Esquel', 'Fukang', 'Gancedo', 'Gao–Guenie', 'Gay Gulch', 'Gebel Kamil', 'Gibeon', 'Goose Lake', 'Grant', 'Hadley Rille', 'Heat Shield Rock','Hoba', 'Homestead', 'Hraschina', 'Huckitta', 'Imilac', 'Itqiy', 'Kaidun','Kainsaz', 'Karoonda', 'Kesen', 'Krasnojarsk', 'L''Aigle', 'Lac Dodon', 'Lake Murray', 'Loreto', 'Los Angeles', 'Łowicz', 'Mackinac Island', 'Mbozi','Middlesbrough', 'Millbillillie', 'Mineo', 'Monte Milone', 'Moss','Mundrabilla', 'Muonionalusta', 'Murchison', 'Nakhla', 'Nantan','Neuschwanstein', 'Northwest Africa 7034', 'Northwest Africa 7325', 'Norton County', 'Novato', 'Northwest Africa 3009', 'Oileán Ruaidh (Martian)', 'Old Woman', 'Oldenburg', 'Omolon', 'Orgueil', 'Ornans', 'Osseo', 'Österplana 065','Ourique', 'Pallasovka', 'Paragould', 'Park Forest', 'Pavlovka', 'Peace River','Peekskill', 'Penouille', 'Polonnaruwa', 'High Possil', 'Příbram', 'Pultusk','Qidong', 'Richardton', 'Santa Vitoria do Palmar', 'Sayh al Uhaymir 169','Seymchan', 'Shelter Island', 'Shergotty', 'Sikhote-Alin', 'Sołtmany','Springwater', 'St-Robert', 'Stannern', 'Sulagiri', 'Sutter''s Mill','Sylacauga', 'Tagish Lake', 'Tamdakht', 'Tenham', 'Texas Fireball', 'Tissint','Tlacotepec', 'Toluca', 'Treysa', 'Twannberg', 'Veliky Ustyug', 'Vermillion','Weston', 'Willamette', 'Winona', 'Wold Cottage', 'Yamato 000593','Yamato 691','Yamato 791197', 'Yardymly', 'Zagami', 'Zaisho', 'Zaklodzie']
-      launch_vehicle: ['Antares', 'Ariane 5', 'Atlas', 'Diamant', 'Dnepr', 'Delta', 'Electron', 'Energia', 'Europa', 'Falcon 9', 'Falcon Heavy', 'GSLV', 'Juno', 'Long March', 'Mercury-Redstone', 'Minotaur', 'Pegasus', 'Proton', 'PSLV', 'Safir', 'Shavit', 'Saturn IV', 'Semiorka', 'Soyouz', 'Titan', 'Vega', 'Veronique', 'Zenit']
+      launch_vehicule: ['Antares', 'Ariane 5', 'Atlas', 'Diamant', 'Dnepr', 'Delta', 'Electron', 'Energia', 'Europa', 'Falcon 9', 'Falcon Heavy', 'GSLV', 'Juno', 'Long March', 'Mercury-Redstone', 'Minotaur', 'Pegasus', 'Proton', 'PSLV', 'Safir', 'Shavit', 'Saturn IV', 'Semiorka', 'Soyouz', 'Titan', 'Vega', 'Veronique', 'Zenit']
@@ -226,7 +226,7 @@ en:
        admiral_ackbar: ['akbar', 'ackbar', 'admiral ackbar', 'admiral akbar', 'admiral_ackbar']
        ahsoka_tano: ['ahsoka', 'tano', 'ahsoka tano', 'ahsoka_tano']
        anakin_skywalker: ['anakin', 'anakin skywalker', 'ani', 'ani skywalker', 'anakin_skywalker']
-        asajj_ventress: ['asajj', 'ventress', 'asajj ventress', 'asajj_ventress']
+        asajj_ventress: ['asajj', 'ventress', 'asajj ventress', 'anakin_skywalker']
        bendu: ['the bendu', 'bendu']
        boba_fett: ['boba fett', 'bobafett', 'boba_fett']
        c_3po: ['c 3po', 'c3po', 'c3p0', 'c_3po']
@@ -2,7 +2,7 @@ en:
  faker:
    stargate:
      characters: ["Jack O'Neill", "Teal'c", "Daniel Jackson", "Samantha Carter", "Janet Frasier", "George Hammond", "Jonas Quinn", "Cameron Mitchell", "Vala Mal Doran", "Kawalsky", "Jacob Carter", "Kasuf", "Sha're", "Skaara", "Thor", "Anubis", "Apophis", "Ba'al", "Cronus", "Hathor", "Heru-ur", "Klorel", "Ra", "Amonet", "Osiris", "Sokar", "Bra'tac", "Lantash", "Selmak", "Jolinar", "Martouf", "Cassandra", "Harlan"]
-      planets: ["Abydos", "Altair", "Asuras", "Athos", "Celestis", "Chulak", "Dakara", "Earth", "Langara", "Lantea", "Orilla", "P3X-888", "Sateda", "Tollana", "Vorash"]
+      planets: ["Abydos", "Altair", Asuras", "Athos", "Celestis", "Chulak", "Dakara", "Earth", "Langara", "Lantea", "Orilla", "P3X-888", "Sateda", "Tollana", "Vorash"]
      quotes: [
        "What is an Oprah?",
        "Teal'c, look scary and take point.",
@@ -19,3 +19,4 @@ en:
        "Indeed.",
        "You ended that sentence with a preposition. Bastard!"
        ]
+
@@ -1,7 +1,7 @@
 en:
  faker:
    subscription:
-      plans: ["Free Trial", "Basic", "Starter", "Essential", "Student", "Bronze", "Standard", "Silver", "Gold", "Platinum", "Professional", "Business", "Diamond", "Premium"]
+      plans: ["Free Trial", "Basic", "Starter", "Essential", "Student", Bronze", "Standard", "Silver", "Gold", "Platinum", "Professional", "Business", "Diamond", "Premium"]
      statuses: ["Active", "Idle", "Blocked", "Pending"]
      payment_methods: ["Credit card", "Debit card", "Paypal", "Cash", "Money transfer", "Bitcoins", "Cheque", "Apple Pay", "Google Pay", "WeChat Pay", "Alipay", "Visa checkout"]
      subscription_terms: ["Daily", "Weekly", "Monthly", "Annual", "Biennal", "Triennal", "Quinquennal", "Lifetime"]
@@ -3,7 +3,6 @@ en:
    games:
      super_smash_bros:
        fighter:
-          - Banjo-Kazooie
          - Bayonetta
          - Bowser
          - Bowser Jr.
@@ -23,16 +22,12 @@ en:
          - Fox
          - Ganondorf
          - Greninja
-          - Hero
          - Ice Climbers
          - Ike
-          - Incineroar
          - Inkling
          - Isabelle
          - Ivysaur
          - Jigglypuff
-          - Joker
-          - Ken
          - King Dedede
          - King K. Rool
          - Kirby
@@ -58,7 +53,6 @@ en:
          - Peach
          - Pichu
          - Pikachu
-          - Piranha Plant
          - Pit
          - Pokémon Trainer
          - R.O.B.
@@ -139,7 +133,6 @@ en:
          - Mario Bros.
          - Mario Circuit
          - Mario Galaxy
-          - Mementos
          - Midgar
          - Miiverse
          - Moray Towers
@@ -181,7 +174,6 @@ en:
          - Skyworld
          - Smashville
          - Spear Pillar
-          - Spiral Mountain
          - Spirit Train
          - Summit
          - Super Happy Tree
@@ -6,6 +6,40 @@ en:
        witchers: ["Geralt of Rivia", "Coën", "Vesemir", "Eskel", "Lambert", "Letho of Gulet","Ciri","George of Kagen","Jerome Moreau","Auckes","Serrit","Kolgrim","Ivar Evil-Eye","Junod of Belhaven","Gerd"]
        schools: ["Wolf", "Griffin", "Cat", "Viper", "Manticore", "Bear"]
        locations: ["Aedd Gynvael","Aldersberg","Beauclair","Cidaris","Cintra","Gors Velen","Maribor","Novigrad","Oxenfurt","Tretogor","Vengerberg","Vizima","Ard Carraigh","Bremervoord","Brugge","Claremont","Creyden","Fen Aspra","Hengfors","Lan Exeter","Pont Vanis","Lyria","Maecht","Malleore","Metinna","Nilfgaard","Neunreuth","Rakverelin","Rivia","Thurn","Acorn Bay","Anchor","Assengard","Attre","Ban Ard","Ban Gleán","Barefield","Belhaven","Blaviken","Brenna","Breza","Burdorff","Caelf","Carreras","Craag An","Crinfrid","Daevon","Dillingen","Dorian","Druigh","Dudno","Duén Canell","Dun Dâre","Ellander","Eysenlaan","Fano","Foam","Forgeham","Fox Hollow","Ghelibol","Glyswen","Gulet","Hochebuz","Jealousy","Kaczan","Kagen","Kerack","Kernow","Klucz","Knotweed Meadow","Little Marsh","Lower Posada","Malhoun","Mirt","Murivel","New Ironworks","Porog","Riedbrune","Rinde","Roggeveen","Tegamo","Tigg","Tridam","Tyffi","Unicorn","Upper Posada","Vattweir","Vole","White Bridge","Zavada","Armeria","Baldhorn","Ban Gleán","Beauclair","Bodrog","Carcano","Castel Ravello","Darn Dyffra","Darn Rowan","Darn Ruach","Dillingen","Dorndal","Drakenborg","Fen Aspra","Glevitzingen","Gwendeith","Hagge","Houtborg","Kaer Morhen","Kaer Trolde","Leyda","Loc Grim","Mayena","Mirt","Montecalvo","Montsalvat","Nastrog","Razwan","Red Binduga","Rocayne","Rhys-Rhun","Riedbrune","Rozrog","Sarda","Scala","Schwemmland","Spalla","Stygga","Tigg","Vartburg","Vedette","Vidort","Winneburg","Zurbarran","Est Haemlet","Loc Muinne","Shaerrawedd"]
-        quotes: ["Just five more minutes… Is it 1358 yet? No? Then fuck off!","Finish all your business before you die. Bid loved ones farewell. Write your will. Apologize to those you’ve wronged. Otherwise, you’ll never truly leave this world.","Hide the wenches, Witcher's coming!!","Oh year... the Elder Blood can be fiery","Damn, Eskel... you got an hourglass figure","No Lollygagin'!","You get what you get and be happy with it","I'll stick me boot so far up yer arse your tongue'll taste like wench twat"]
+        quotes: [
+          "Just five more minutes… Is it 1358 yet? No? Then fuck off!",
+          "Finish all your business before you die. Bid loved ones farewell. Write your will. Apologize to those you’ve wronged. Otherwise, you’ll never truly leave this world.",
+          "Hide the wenches, Witcher's coming!!","Oh year... the Elder Blood can be fiery",
+          "Damn, Eskel... you got an hourglass figure","No Lollygagin'!",
+          "You get what you get and be happy with it","I'll stick me boot so far up yer arse your tongue'll taste like wench twat",
+          "Evil is evil, Stregobor. Lesser, greater, middling, it's all the same. Proportions are negotiated, boundaries blurred. I'm not a pious hermit, I haven't done only good in my life. But if I'm to choose between one evil and another, then I prefer not to choose at all.",
+          "One hand washes the other. Freedom and contempt have their limits. In the end, it is always the case that one is someone else's tool.",
+          "You cannot do it. You cannot do it, witcheress. In Kaer Morhen, they taught you to kill, so you kill like a machine. Instinctively. To kill yourself takes character, strength, determination and courage. But that, that they could not teach you.",
+          "Death, the final judgement. The Beast has met its end once. It doesn't fear death, it is death. How will you defeat human villainy? With your sword? You who died and still walk amongst the living?",
+          "Well, there’s a war, so there’s orphans. Didn’t [you] know that?",
+          "Know when a legend becomes a prophecy? When it gains believers.",
+          "You don’t need mutations to strip men of their humanity. I’ve seen plenty of examples.",
+          "To be neutral does not mean to be indifferent or insensitive. You don't have to kill your feelings. It's enough to kill hatred within yourself.",
+          "There is never a second opportunity to make a first impression.",
+          "People”—Geralt turned his head—“like to invent monsters and monstrosities. Then they seem less monstrous themselves.",
+          "A mother, you son-of-a-bitch, is sacred!",
+          "Only Evil and Greater Evil exist and beyond them, in the shadows, lurks True Evil. True Evil, Geralt, is something you can barely imagine, even if you believe nothing can still surprise you. And sometimes True Evil seizes you by the throat and demands that you choose between it and another, slightly lesser, Evil.",
+          "Only death can finish the fight, everything else only interrupts the fighting.",
+          "Mistakes,’ he said with effort, ‘are also important to me. I don’t cross them out of my life, or memory. And I never blame others for them.",
+          "What is truth? The negation of lies? Or the statement of a fact? And if the fact is a lie, what then is the truth?",
+          "They weren't lying. They firmly believed it all. Which doesn't change the facts.",
+          "There's a grain of truth in every fairy tale.",
+          "I need this conversation. They say silence is golden. Maybe it is, although I'm not sure it's worth that much. It has its price certainly; you have to pay for it.",
+          "You’ve mistaken the stars reflected on the surface of the lake at night for the heavens.",
+          "It is easy to kill with a bow, girl. How easy it is to release the bowstring and think, it is not I, it is the arrow. The blood of that boy is not on my hands. The arrow killed him, not I. But the arrow does not dream anything in the night.",
+          "The sword of destiny has two edges. You are one of them.",
+          "When you know about something it stops being a nightmare. When you know how to fight something, it stops being so threatening.",
+          "As usual, cats and children noticed him first.",
+          "That’s the role of poetry, Ciri. To say what others cannot utter.",
+          "No one wants to suffer. But that is the fate of each. And some suffer more. Not necessarily of their own volition. It's not about to enduring the suffering. It's about how you endure it.",
+          "Destiny has many faces. Mine is beautiful on the outside and hideous on the inside. She has stretched her bloody talons toward me—",
+          "A coward,' he declared with dignity, when he'd stopped coughing and had got his breath back, 'dies a hundred times. A brave man dies but once. But Dame Fortune favours the brave and holds the coward in contempt.'",
+          "I thought I was choosing the lesser evil. I chose the lesser evil. Lesser evil! I’m Geralt! Witcher…I’m the Butcher of Blaviken—"
+        ]
        monsters: ["Archespore","Berserker","Botchling","Lubberkin","Ulfhedinn","Werewolf","The Toad Prince","Basilisk","Cockatrice","Forktail","Royal Wyvern","Shrieker","Silver Basilisk","Slyzard Matriarch","Slyzard","Dragon of Fyresdal","Wyvern","Djinn","Earth Elemental","Fire Elemental","Gargoyle","Golem","Hound of the Wild Hunt","Ice Elemental","Pixie","Apiarian Phantom","Therazane","Ekhidnae","Erynias","Griffin","Harpy","Melusine","Opinicus","Salma","Siren","Succubus","Arachas","Arachnomorph","Endrega Drone","Endrega Warrior","Endrega Worker","Giant Centipede","Kikimore","Kikimore Worker","Pale Widow","Abaya","Alghoul","Drowner","Foglet","Ghoul","Grave Hag","Ignis Fatuus","Mourntart","Mucknixer","Rotfiend","Scurver","Spotted Wight","Water Hag","Wight","Cloud Giant","Cyclopse","Golyat","Hagubman","Ice Giant","Ice Troll","Nekker","Rock Troll","Wham-a-Wham","Chort","Crone","Doppler","Fiend","Fugas","Godling","Grottore","Howler","Imp","Kernun","Leshen","Morvudd","Shaelmaar","Spriggan","Sylvan","The Caretaker","Barghests","Ethereal","Hym","Longlocks","Nightwraith","Noonwraith","Penitent","Plague Maiden","Umbra","Wraith","Alp","Bruxa","Ekimmara","Gael","Garkain","Higher Vampire","Katakan"]

@@ -60,7 +60,7 @@ fr-CH:
        - "#{first_name} #{last_name} #{last_name}"
        
    phone_number:
-      formats: ['02########', '03########', '04########', '05########', '09########', '+41 1########', '+41 2########', '+41 3########', '+41 4########', '+41 5########', '+41 9########', '01 ## ## ## ##', '02 ## ## ## ##', '03 ## ## ## ##', '04 ## ## ## ##', '05 ## ## ## ##', '09 ## ## ## ##', '+41 1 ## ## ## ##', '+41 2 ## ## ## ##', '+41 3 ## ## ## ##', '+41 4 ## ## ## ##', '+41 5 ## ## ## ##', '+41 9 ## ## ## ##']
+      formats: ['', '02########', '03########', '04########', '05########', '09########', '+41 1########', '+41 2########', '+41 3########', '+41 4########', '+41 5########', '+41 9########', '01 ## ## ## ##', '02 ## ## ## ##', '03 ## ## ## ##', '04 ## ## ## ##', '05 ## ## ## ##', '09 ## ## ## ##', '+41 1 ## ## ## ##', '+41 2 ## ## ## ##', '+41 3 ## ## ## ##', '+41 4 ## ## ## ##', '+41 5 ## ## ## ##', '+41 9 ## ## ## ##']

    cell_phone:
      formats: ['#####.######', '+41.####.######']
@@ -58,10 +58,6 @@ fr:
        - "#{Name.last_name} #{suffix}"
        - "#{Name.last_name} et #{Name.last_name}"

-    creature:
-      animal:
-        name: ["agneau", "aigle", "albatros", "alligator", "alpaga", "anaconda", "ane", "antilope", "araignée", "autruche", "babouin", "baleine", "belette", "béluga", "biche", "bison", "blaireau", "boa", "boeuf", "bonobo", "bouquetin", "brebis", "buffle", "cachalot", "canard", "capucin", "capybara", "caribou", "carpe", "castor", "cerf", "chacal", "chameau", "chamois", "chat", "chauve-souris", "cheval", "chèvre", "chevreuil", "chien", "chimpanzé", "chinchilla", "chouette", "cigogne", "civette", "coati", "cobaye", "coccinelle", "cochon", "coq", "coyote", "crabe", "crocodile", "cygne", "daim", "dauphin", "dinde", "dindon", "dingo", "drill", "dromadaire", "écureuil", "élan", "éléphant", "émeu", "epaulard", "escargot", "espadon", "faisan", "faon", "faucon", "fennec", "flamant rose", "fouine", "fourmilier", "furet", "gazelle", "gerbille", "gerboise", "gibbon", "girafe", "glouton", "gnou", "goret", "gorille", "grenouille", "grizzly", "grue", "guépard", "hamster", "hérisson", "hermine", "héron", "hibou", "hippocampe", "hippopotame", "hirondelle", "hyène", "ibis", "iguane", "impala", "isard", "isatis", "jaguar", "kangourou", "kiwi", "koala", "lamantin", "lamas", "lapin", "lemming", "lémurien", "léopard", "lézard", "lièvre", "lion", "loir", "loup", "loutre", "lynx", "macaque", "mammouth", "manchot", "mandrill", "mangouste", "marmotte", "marsouin", "mésange", "morse", "mouette", "moufette", "mouflon", "mouton", "mulet", "mulot", "musaraigne", "narval", "nasique", "ocelot", "oie", "okapi", "opossum", "ornithorynque", "orque", "oryx", "otarie", "ouistiti", "ours", "pandas", "pangolin", "panthère", "paon", "paresseux", "pélican", "perroquet", "phacochère", "phoque", "pie", "pingouin", "pipistrelle", "poney", "porc", "porc-épic", "poule", "poulet", "poulpe", "poussin", "puma", "putois", "python", "quetzal", "ragondin", "rat", "raton laveur", "renard", "requin", "requin baleine", "rhésus", "rhinocéros", "roussette", "salamandre", "sanglier", "serpent", "serval", "singe", "souris", "sphynx", "suricate", "tamanoir", "tamarin", "tapir", "tatou", "taupe", "taureau", "tigre", "tortue", "toucan", "unau", "urubu", "vache", "varan", "vautour", "veau", "vipère", "vison", "wallaby", "wapiti", "wombat", "yack", "zèbre", "zébu", "zibeline", "zorille"]
-        
    demographic:
      sex: ["Homme", "Femme"]

@@ -63,7 +63,7 @@ it:
    phone_number:
      formats: ['+## ### ## ## ####', '+## ## #######', '+## ## ########', '+## ### #######', '+## ### ########', '+## #### #######', '+## #### ########', '0## ### ####', '+39 0## ### ###', '3## ### ###', '+39 3## ### ###']
    subscription:
-      plans: ["Prova gratuita", "Basico", "Starter", "Essential", "Studente", "Bronze", "Standard", "Silver", "Gold", "Platinum", "Profesional", "Business", "Diamond", "Premium"]
+      plans: ["Prova gratuita", "Basico", "Starter", "Essential", "Studente", Bronze", "Standard", "Silver", "Gold", "Platinum", "Profesional", "Business", "Diamond", "Premium"]
      statuses: ["Attivo", "Inattivo", "Bloccato", "In sospeso"]
      payment_methods: ["Carta di credito", "Carta di debito", "Paypal", "Contanti", "Bonifico", "Bitcoins", "Assegno", "Apple Pay", "Google Pay", "WeChat Pay", "Alipay", "Visa Checkout"]
      subscription_terms: ["Quotidiano", "Settimanale", "Mensile", "Annuale", "Biennale", "Triennale", "Quinquennale", "Abbonamento a vita"]
@@ -7,7 +7,6 @@ import java.util.Locale;
 import java.util.Random;

 import static com.github.javafaker.matchers.IsANumber.isANumber;
-import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents;
 import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
@@ -108,20 +107,9 @@ public class AddressTest extends AbstractFakerTest {
        assertThat(faker.address().zipCodeByState(faker.address().stateAbbr()), matchesRegularExpression("[0-9]{5}"));
    }

-    @Test
-    public void testHungarianZipCodeByState() {
-        faker = new Faker(new Locale("hu"));
-        assertThat(faker.address().zipCodeByState(faker.address().stateAbbr()), matchesRegularExpression("[0-9]{4}"));
-    }
-
    @Test
    public void testCountyByZipCode() {
        faker = new Faker(new Locale("en-US"));
-        assertThat(faker.address().countyByZipCode("47732"), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void testStreetPrefix() {
-        assertThat(faker.address().streetPrefix(), isStringWithContents());
+        assertThat(faker.address().countyByZipCode(faker.address().zipCodeByState(faker.address().stateAbbr())), not(isEmptyOrNullString()));
    }
 }
@@ -1,15 +0,0 @@
-package com.github.javafaker;
-
-import org.junit.Test;
-
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.junit.Assert.assertThat;
-
-public class AnimalTest extends AbstractFakerTest {
-
-    @Test
-    public void name() {
-        assertThat(faker.animal().name(), matchesRegularExpression("[A-Za-z ]+"));
-    }
-
-}
@@ -1,15 +0,0 @@
-package com.github.javafaker;
-
-import org.junit.Test;
-
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.junit.Assert.assertThat;
-
-public class AquaTeenHungerForceTest extends AbstractFakerTest {
-
-    @Test
-    public void character() {
-        assertThat(faker.aquaTeenHungerForce().character(), matchesRegularExpression("[A-Za-z .]+"));
-    }
-
-}
@@ -1,25 +1,17 @@
 package com.github.javafaker;

+import com.github.javafaker.repeating.Repeat;
 import org.junit.Test;

-import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents;
 import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.junit.Assert.assertThat;

 public class AviationTest extends AbstractFakerTest {

    @Test
-    public void airport() {
-        assertThat(faker.aviation().airport(), matchesRegularExpression("\\w{4}"));
+    @Repeat(times=3)
+    public void testAviation() {
+        String airport = faker.aviation().airport();
+        assertThat(airport, matchesRegularExpression("\\w{4}"));
    }
-
-    @Test
-    public void aircraft() {
-        assertThat(faker.aviation().aircraft(), isStringWithContents());
-    }
-
-    @Test
-    public void metar() {
-        assertThat(faker.aviation().METAR(), isStringWithContents());
-    }
-}
+}
@@ -1,33 +0,0 @@
-package com.github.javafaker;
-
-import org.junit.Test;
-
-import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents;
-import static org.junit.Assert.assertThat;
-
-public class BuffyTest extends AbstractFakerTest {
-    @Test
-    public void testCharacters() {
-        assertThat(faker.buffy().characters(), isStringWithContents());
-    }
-
-    @Test
-    public void testQuotes() {
-        assertThat(faker.buffy().quotes(), isStringWithContents());
-    }
-
-    @Test
-    public void testCelebrities() {
-        assertThat(faker.buffy().celebrities(), isStringWithContents());
-    }
-
-    @Test
-    public void testBigBads() {
-        assertThat(faker.buffy().bigBads(), isStringWithContents());
-    }
-
-    @Test
-    public void testEpisodes() {
-        assertThat(faker.buffy().episodes(), isStringWithContents());
-    }
-}
@@ -1,24 +0,0 @@
-package com.github.javafaker;
-
-import org.junit.Test;
-
-import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents;
-import static org.junit.Assert.assertThat;
-
-public class BusinessTest extends AbstractFakerTest {
-    @Test
-    public void creditCardNumber() {
-        assertThat(faker.business().creditCardNumber(), isStringWithContents());
-    }
-
-    @Test
-    public void creditCardType() {
-        assertThat(faker.business().creditCardType(), isStringWithContents());
-    }
-
-    @Test
-    public void creditCardExpiry() {
-        assertThat(faker.business().creditCardExpiry(), isStringWithContents());
-    }
-
-}
@@ -34,12 +34,12 @@ public class CountryTest extends AbstractFakerTest {

    @Test
    public void testCurrency() {
-        assertThat(faker.country().currency(), matchesRegularExpression("([A-Za-zÀ-ÿ'’()-]+ ?)+"));
+        assertThat(faker.country().currency(), matchesRegularExpression("([\\w-]+ ?)+"));
    }

    @Test
    public void testCurrencyCode() {
-        assertThat(faker.country().currencyCode(), matchesRegularExpression("([\\w-’í]+ ?)+"));
+        assertThat(faker.country().currencyCode(), matchesRegularExpression("([\\w-]+ ?)+"));
    }

    @Test
@@ -84,12 +84,10 @@ public class DateAndTimeTest extends AbstractFakerTest {
    @Test
    public void testBirthday() {
        int currentYear = Calendar.getInstance().get(Calendar.YEAR);
-        int currentMonth = Calendar.getInstance().get(Calendar.MONTH);
-        int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
-        long from = new GregorianCalendar(currentYear - 65, currentMonth, currentDay).getTime().getTime();
-        long to = new GregorianCalendar(currentYear - 18, currentMonth, currentDay).getTime().getTime();
+        long from = new GregorianCalendar(currentYear - 65, 0, 1).getTime().getTime();
+        long to = new GregorianCalendar(currentYear - 18, 11, 31).getTime().getTime();

-        for (int i = 0; i < 5000; i++) {
+        for (int i = 0; i < 1000; i++) {
            Date birthday = faker.date().birthday();
            assertThat("birthday is after upper bound", birthday.getTime(), lessThan(to));
            assertThat("birthday is before lower bound", birthday.getTime(), greaterThanOrEqualTo(from));
@@ -99,18 +97,16 @@ public class DateAndTimeTest extends AbstractFakerTest {
    @Test
    public void testBirthdayWithAges() {
        int currentYear = Calendar.getInstance().get(Calendar.YEAR);
-        int currentMonth = Calendar.getInstance().get(Calendar.MONTH);
-        int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_MONTH);

-        for (int i = 0; i < 5000; i++) {
+        for (int i = 0; i < 1000; i++) {
            int minAge = faker.number().numberBetween(1, 99);
            int maxAge = faker.number().numberBetween(minAge, 100);

-            long from = new GregorianCalendar(currentYear - maxAge, currentMonth, currentDay).getTime().getTime();
-            long to = new GregorianCalendar(currentYear - minAge, currentMonth, currentDay).getTime().getTime();
+            long from = new GregorianCalendar(currentYear - maxAge, 0, 1).getTime().getTime();
+            long to = new GregorianCalendar(currentYear - minAge, 11, 31).getTime().getTime();

            Date birthday = faker.date().birthday(minAge, maxAge);
-            assertThat("birthday is after upper bound", birthday.getTime(), lessThanOrEqualTo(to));
+            assertThat("birthday is after upper bound", birthday.getTime(), lessThan(to));
            assertThat("birthday is before lower bound", birthday.getTime(), greaterThanOrEqualTo(from));
        }
    }
@@ -1,52 +0,0 @@
-package com.github.javafaker;
-
-import com.github.javafaker.repeating.Repeat;
-import org.junit.Test;
-
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.junit.Assert.assertThat;
-
-public class DuneTest extends AbstractFakerTest {
-
-    @Test
-    public void character() {
-        assertThat(faker.dune().character(), matchesRegularExpression("[A-Za-z '\\-\"]+"));
-    }
-
-    @Test
-    public void title() {
-        assertThat(faker.dune().title(), matchesRegularExpression("[A-Za-z ]+"));
-    }
-
-    @Test
-    public void planet() {
-        assertThat(faker.dune().planet(), matchesRegularExpression("[A-Za-z ]+"));
-    }
-
-    @Test
-    public void quote() {
-        assertThat(faker.dune().quote(), matchesRegularExpression("\\P{Cc}+"));
-    }
-
-    @Test
-    @Repeat(times = 10000)
-    public void randomQuote() {
-        assertThat(
-                faker.dune().quote(faker.options().option(Dune.Quote.class)),
-                matchesRegularExpression("\\P{Cc}+"));
-    }
-
-    @Test
-    public void saying() {
-        assertThat(faker.dune().saying(), matchesRegularExpression("\\P{Cc}+"));
-    }
-
-    @Test
-    @Repeat(times = 10000)
-    public void randomSaying() {
-        assertThat(
-                faker.dune().saying(faker.options().option(Dune.Saying.class)),
-                matchesRegularExpression("\\P{Cc}+"));
-    }
-
-}
@@ -1,52 +0,0 @@
-
-
-package com.github.javafaker;
-
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
-
-public class ElderScrollsTest extends AbstractFakerTest  {
-
-    @Test
-    public void testCity() {
-        assertThat(faker.elderScrolls().city(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void testCreature() {
-        assertThat(faker.elderScrolls().creature(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void testDragon() {
-        assertThat(faker.elderScrolls().dragon(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void testFirstName() {
-        assertThat(faker.elderScrolls().firstName(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void testLastName() {
-        assertThat(faker.elderScrolls().lastName(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void testRace() {
-        assertThat(faker.elderScrolls().race(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void testRegion() {
-        assertThat(faker.elderScrolls().region(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void testQuote() {
-        assertThat(faker.elderScrolls().quote(), not(isEmptyOrNullString()));
-    }
-}
@@ -1,6 +1,5 @@
 package com.github.javafaker;

-import com.github.javafaker.repeating.Repeat;
 import org.junit.Test;

 import java.util.Locale;
@@ -134,12 +133,6 @@ public class FakerTest extends AbstractFakerTest {
        assertThat(faker.expression("#{color.name}"), matchesRegularExpression("[a-z\\s]+"));
    }

-    @Test
-    @Repeat(times = 100)
-    public void numberBetweenRepeated() {
-        assertThat(faker.expression("#{number.number_between '1','10'}"), matchesRegularExpression("[1-9]"));
-    }
-
    @Test
    public void regexifyShouldGenerateSameValueForFakerWithSameSeed() {
        long seed = 1L;
@@ -9,7 +9,7 @@ public class FoodTest extends AbstractFakerTest {

    @Test
    public void ingredient() {
-        assertThat(faker.food().ingredient(), matchesRegularExpression("[A-Za-z- ]+"));
+        assertThat(faker.food().ingredient(), matchesRegularExpression("[A-Za-z ]+"));
    }

    @Test
@@ -17,26 +17,6 @@ public class FoodTest extends AbstractFakerTest {
        assertThat(faker.food().spice(), matchesRegularExpression("[A-Za-z1-9- ]+"));
    }

-    @Test
-    public void dish() {
-        assertThat(faker.food().dish(), matchesRegularExpression("\\P{Cc}+"));
-    }
-
-    @Test
-    public void fruit() {
-        assertThat(faker.food().fruit(), matchesRegularExpression("[A-Za-z1-9- ]+"));
-    }
-
-    @Test
-    public void vegetable() {
-        assertThat(faker.food().vegetable(), matchesRegularExpression("[A-Za-z1-9- ]+"));
-    }
-
-    @Test
-    public void sushi() {
-        assertThat(faker.food().sushi(), matchesRegularExpression("[A-Za-z1-9- ]+"));
-    }
-
    @Test
    public void measurement() {
        assertThat(faker.food().measurement(), matchesRegularExpression("[A-Za-z1-9/ ]+{2}"));
@@ -28,14 +28,4 @@ public class HarryPotterTest extends AbstractFakerTest {
    public void book() {
        assertThat(faker.harryPotter().book(), matchesRegularExpression("Harry Potter and the ([A-Za-z'\\-]+ ?)+"));
    }
-
-    @Test
-    public void house() {
-        assertThat(faker.harryPotter().house(), matchesRegularExpression("[A-Za-z ]+"));
-    }
-
-    @Test
-    public void spell() {
-        assertThat(faker.harryPotter().spell(), matchesRegularExpression("[A-Za-z ]+"));
-    }
 }
@@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.hamcrest.Matchers;
+import org.hamcrest.core.IsNot;
 import org.junit.Test;

 import java.util.List;
@@ -197,7 +198,7 @@ public class InternetTest extends AbstractFakerTest {
        assertThat(faker.internet().ipV4Cidr(), countOf('/', is(1)));
        
        for (int i = 0; i < 1000; i++) {
-            assertThat(parseInt(faker.internet().ipV4Cidr().split("/")[1]),
+            assertThat(parseInt(faker.internet().ipV4Cidr().split("\\/")[1]),
                    both(greaterThanOrEqualTo(1)).and(lessThan(32)));
        }
    }
@@ -256,7 +257,7 @@ public class InternetTest extends AbstractFakerTest {
        assertThat(faker.internet().ipV6Cidr(), countOf('/', is(1)));

        for (int i = 0; i < 1000; i++) {
-            assertThat(parseInt(faker.internet().ipV6Cidr().split("/")[1]),
+            assertThat(parseInt(faker.internet().ipV6Cidr().split("\\/")[1]),
                    both(greaterThanOrEqualTo(1)).and(lessThan(128)));
        }
    }
@@ -10,7 +10,7 @@ public class LeagueOfLegendsTest extends AbstractFakerTest {

    @Test
    public void champion() {
-        assertThat(faker.leagueOfLegends().champion(), matchesRegularExpression("^(\\w+\\.?-?'?\\s?&?\\s?)+$"));
+        assertThat(faker.leagueOfLegends().champion(), matchesRegularExpression("^(\\w+\\.?-?'?\\s?)+$"));
    }

    @Test
@@ -1,15 +1,12 @@
 package com.github.javafaker;

 import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;

-import org.hamcrest.Matchers;
 import org.junit.Test;

 public class LoremTest extends AbstractFakerTest {
@@ -74,7 +71,7 @@ public class LoremTest extends AbstractFakerTest {

    @Test
    public void testCharactersMinimumMaximumLengthIncludeUppercase() {
-        assertThat(faker.lorem().characters(1, 10, true), matchesRegularExpression("[a-zA-Z\\d]{1,10}"));
+        assertThat(faker.lorem().characters(1, 10), matchesRegularExpression("[a-zA-Z\\d]{1,10}"));
    }

    @Test
@@ -103,8 +100,4 @@ public class LoremTest extends AbstractFakerTest {
        assertThat(faker.lorem().sentence(10, 0), matchesRegularExpression("(\\w+\\s?){10}\\."));
    }

-    @Test
-    public void testWords() {
-        assertThat(faker.lorem().words(), hasSize(greaterThanOrEqualTo(1)));
-    }
 }
@@ -74,10 +74,5 @@ public class NameTest  extends AbstractFakerTest{
        doReturn(name).when(faker).name();
        assertThat(faker.name().username(), matchesRegularExpression("^(\\w+)\\.(\\w+)$"));
    }
-    
-    @Test
-    public void testBloodGroup() {
-        assertThat(faker.name().bloodGroup(), matchesRegularExpression("(A|B|AB|O)[+-]"));
-    }

 }
@@ -1,36 +0,0 @@
-package com.github.javafaker;
-
-import org.junit.Test;
-
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-public class NationTest extends AbstractFakerTest {
-
-    @Test
-    public void nationality() {
-        assertThat(faker.nation().nationality(), matchesRegularExpression("\\P{Cc}+"));
-    }
-
-    @Test
-    public void language() {
-        assertThat(faker.nation().language(), matchesRegularExpression("[A-Za-z ]+"));
-    }
-
-    @Test
-    public void capitalCity() {
-        assertThat(faker.nation().capitalCity(), matchesRegularExpression("[A-Za-z .'()-]+"));
-    }
-
-    @Test
-    public void flag() {
-        String flag = faker.nation().flag();
-
-        // all utf8 emoji flags are at least 4 characters long and start with the same char
-        assertThat(flag.length(), is(greaterThanOrEqualTo(4)));
-        assertThat(flag.charAt(0), is('\uD83C'));
-    }
-
-}
@@ -1,6 +1,5 @@
 package com.github.javafaker;

-import com.github.javafaker.repeating.Repeat;
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -15,7 +14,6 @@ import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicLong;

-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;

@@ -122,26 +120,6 @@ public class NumberTest extends AbstractFakerTest {
        assertThat(v1, is(lessThan(980000000L)));
    }

-    @Test
-    @Repeat(times = 100)
-    public void testLongNumberBetweenRepeated() {
-        long low = 1;
-        long high = 10;
-        long v = faker.number().numberBetween(low, high);
-        assertThat(v, is(lessThan(high)));
-        assertThat(v, is(greaterThanOrEqualTo(low)));
-    }
-
-    @Test
-    @Repeat(times = 100)
-    public void testIntNumberBetweenRepeated() {
-        int low = 1;
-        int high = 10;
-        int v = faker.number().numberBetween(low, high);
-        assertThat(v, is(lessThan(high)));
-        assertThat(v, is(greaterThanOrEqualTo(low)));
-    }
-
    @Test
    public void testNumberBetweenOneAndThree() {
        Set<Integer> nums = Sets.newHashSet();
@@ -156,20 +134,6 @@ public class NumberTest extends AbstractFakerTest {
        assertThat(nums, contains(0, 1, 2));
    }

-    @Test
-    public void testLongBetweenOneAndThree() {
-        Set<Long> nums = Sets.newHashSet();
-        final long lowerLimit = 0;
-        final long upperLimit = 3;
-        for (int i = 0; i < 1000; ++i) {
-            long value = faker.number().numberBetween(lowerLimit, upperLimit);
-            assertThat(value, is(lessThan(upperLimit)));
-            assertThat(value, is(greaterThanOrEqualTo(lowerLimit)));
-            nums.add(value);
-        }
-        assertThat(nums, contains(0L, 1L, 2L));
-    }
-
    @Test
    public void numberBetweenIntIntZeroMinMax() {
        assertThat("Calling numberBetween with min==max yields min, with 0",
@@ -302,29 +266,6 @@ public class NumberTest extends AbstractFakerTest {
                extremeRunUniquePercent, greaterThanOrEqualTo(individualRunGtPercentUnique));
    }

-    @Test
-    public void testRandomDoubleMaxEqualsMin() {
-        double actual = faker.number().randomDouble(1, 42, 42);
-
-        double expected = BigDecimal.valueOf(42).doubleValue();
-
-        assertThat(actual, equalTo(expected));
-    }
-
-    @Test
-    public void testDigit() {
-        String digit = faker.number().digit();
-
-        assertThat(digit, matchesRegularExpression("[0-9]"));
-    }
-
-    @Test
-    public void testDigits() {
-        String digits = faker.number().digits(5);
-
-        assertThat(digits, matchesRegularExpression("[0-9]{5}"));
-    }
-
    /**
     * Over the series of numbers identified from RANDOMIZATION_QUALITY_RANGE_START to
     * RANDOMIZATION_QUALITY_RANGE_END, create a min/max range of -value/value and
@@ -1,5 +1,6 @@
 package com.github.javafaker;

+import com.github.javafaker.repeating.Repeat;
 import org.junit.Test;

 import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
@@ -1,20 +0,0 @@
-package com.github.javafaker;
-
-import org.junit.Test;
-
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertThat;
-
-public class PrincessBrideTest extends AbstractFakerTest {
-    @Test
-    public void character() {
-        assertThat(faker.princessBride().character(), matchesRegularExpression("[A-Za-z .-]+"));
-    }
-
-    @Test
-    public void quote() {
-        assertThat(faker.princessBride().quote(), not(isEmptyOrNullString()));
-    }
-}
@@ -1,21 +0,0 @@
-package com.github.javafaker;
-
-import com.github.javafaker.repeating.Repeat;
-import org.junit.Test;
-
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.junit.Assert.assertThat;
-
-public class ProgrammingLanguageTest extends AbstractFakerTest {
-
-    @Test
-    public void name() {
-        assertThat(faker.programmingLanguage().name(), matchesRegularExpression("[A-Za-z0-9 :,.+*()#/\\–\\-@πéöü'′!]+"));
-    }
-
-    @Test
-    public void creator() {
-        assertThat(faker.programmingLanguage().creator(), matchesRegularExpression("[A-Za-z .,\\-]+"));
-    }
-
-}
@@ -1,83 +0,0 @@
-package com.github.javafaker;
-
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.when;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import java.lang.reflect.InvocationTargetException;
-
-public class RelationshipTest extends AbstractFakerTest {
-
-    private Faker mockFaker;
-
-    @Before
-    public void before() {
-        super.before();
-        mockFaker = Mockito.mock(Faker.class);
-    }
-
-    @Test
-    public void anyTest() {
-        assertThat(faker.relationships().any(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void directTest() {
-        assertThat(faker.relationships().direct(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void extendedTest() {
-        assertThat(faker.relationships().extended(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void inLawTest() {
-        assertThat(faker.relationships().inLaw(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void spouseTest() {
-        assertThat(faker.relationships().spouse(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void parentTest() {
-        assertThat(faker.relationships().parent(), not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void siblingTest() {
-        assertThat(faker.relationships().sibling(), not(isEmptyOrNullString()));
-    }
-
-    @Test(expected = RuntimeException.class)
-    public void anyWithIllegalArgumentExceptionThrown() {
-        when(mockFaker.random()).thenThrow(new IllegalArgumentException());
-        new Relationships(mockFaker).any();
-    }
-
-    @Test(expected = RuntimeException.class)
-    public void anyWithSecurityExceptionThrown() {
-        when(mockFaker.random()).thenThrow(new SecurityException());
-        new Relationships(mockFaker).any();
-    }
-
-    @Test(expected = RuntimeException.class)
-    public void anyWithIllegalAccessExceptionThrown() {
-        when(mockFaker.random()).thenThrow(new IllegalAccessException());
-        new Relationships(mockFaker).any();
-    }
-
-    @Test(expected = RuntimeException.class)
-    public void anyWithInvocationTargetExceptionThrown() {
-        when(mockFaker.random()).thenThrow(new InvocationTargetException(new Exception()));
-        new Relationships(mockFaker).any();
-    }
-
-}
@@ -6,32 +6,32 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegu
 import static org.junit.Assert.assertThat;

 public class WitcherTest extends AbstractFakerTest {
-
+    
    @Test
    public void testCharacter() {
        assertThat(faker.witcher().character(), matchesRegularExpression("[A-Za-z' -éúï]+"));
    }
-
+    
    @Test
    public void testWitcher() {
-        assertThat(faker.witcher().witcher(), matchesRegularExpression("[A-Za-z -ëúï]+"));
+        assertThat(faker.witcher().character(), matchesRegularExpression("[A-Za-z -ëúï]+"));
    }
-
+    
    @Test
    public void testSchool() {
        assertThat(faker.witcher().school(), matchesRegularExpression("[A-Za-z]+"));
    }
-
+    
    @Test
    public void testLocation() {
        assertThat(faker.witcher().location(), matchesRegularExpression("[A-Za-z -áâé]+"));
    }
-
+    
    @Test
    public void testQuote() {
        assertThat(faker.witcher().quote(), matchesRegularExpression("[-A-Za-z0-9 —;…\\?\\!\\.’‘'”“,\\[\\]]+"));
    }
-
+    
    @Test
    public void testMonster() {
        assertThat(faker.witcher().monster(), matchesRegularExpression("[A-Za-z -]+"));
@@ -36,7 +36,7 @@ public class FakerIT {
    /**
     * a collection of Locales -> Exceptions.
     * In the case of 'pt', city_prefix is '' by design. This test fails because it's testing that all string returning
-     * methods return a non blank string. But pt city_prefix is blank ,but the test shouldn't fail. So we add put
+     * methods return a non blank string. But pt city_prefix is blank ,but the test shouldn't fail. So we add put 
     * exceptions like this into this collection.
     */
    private static final Map<Locale, List<String>> exceptions = Maps.newHashMap();
@@ -152,15 +152,6 @@ public class FakerIT {
        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.witcher());
        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.weather());
        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.lebowski());
-        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.animal());
-        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.princessBride());
-        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.elderScrolls());
-        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.buffy());
-        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.relationships());
-        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.nation());
-        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.dune());
-        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.aquaTeenHungerForce());
-        testAllMethodsThatReturnStringsActuallyReturnStrings(faker.programmingLanguage());
    }

    private void testAllMethodsThatReturnStringsActuallyReturnStrings(Object object) throws Exception {
@@ -234,7 +234,7 @@ public class FakeValuesServiceTest extends AbstractFakerTest {

    @Test
    public void futureDateExpression() throws ParseException {
-        SimpleDateFormat dateFormat = new SimpleDateFormat( "EEE MMM dd HH:mm:ss z yyyy", Locale.ENGLISH  );
+        SimpleDateFormat dateFormat = new SimpleDateFormat( "EEE MMM dd HH:mm:ss z yyyy" );

        Date now = new Date();
        Date nowPlus10Days = new Date( now.getTime() + MILLIS_IN_A_DAY * 10 );
@@ -247,7 +247,7 @@ public class FakeValuesServiceTest extends AbstractFakerTest {

    @Test
    public void pastDateExpression() throws ParseException {
-        SimpleDateFormat dateFormat = new SimpleDateFormat( "EEE MMM dd HH:mm:ss z yyyy", Locale.ENGLISH );
+        SimpleDateFormat dateFormat = new SimpleDateFormat( "EEE MMM dd HH:mm:ss z yyyy" );

        Date now = new Date();
        Date nowMinus5Hours = new Date( now.getTime() - MILLIS_IN_AN_HOUR * 5 );
@@ -258,13 +258,6 @@ public class FakeValuesServiceTest extends AbstractFakerTest {
        assertThat( date.getTime(), lessThan( now.getTime() ));
    }

-    @Test
-    public void expressionWithFourArguments() throws ParseException {
-
-        assertThat(fakeValuesService.expression("#{Internet.password '5','8','true','true'}", faker),
-            matchesRegularExpression("[\\w\\d\\!%#$@_\\^&\\*]{5,8}"));
-    }
-
    /**
     * Two things are important here:
     * 1) the message in the exception should be USEFUL
Author	SHA1	Message	Date
Ricky Yim	0147cc7925	Merge pull request #442 from mindworks-software/updated_resource_files Fix postcode property name	2020-07-06 18:18:14 +10:00
Dario Matonicki	84359c41c8	Fix postcode property name	2019-09-26 12:28:20 +02:00