106 changed files with 227 additions and 3328 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -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.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -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.
--- a/.travis.yml
+++ b/.travis.yml
@ -1,17 +1,17 @@
 language: java
-dist: xenial
+dist: trusty
 jdk:
+- oraclejdk8
+- openjdk7
 - 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
+
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -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
--- a/README.md
+++ b/README.md
@ -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.2</version>
+    <version>1.0.0</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.2'
+    implementation 'com.github.javafaker:javafaker:1.0.0'
 }

 ```
@ -56,45 +56,37 @@ 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
-* Basketball
 * Beer
-* Bojack Horseman
 * Book
 * Bool
 * Business
 * ChuckNorris
 * Cat
 * Code
-* Coin
 * Color
 * Commerce
 * Company
 * Crypto
 * DateAndTime
 * Demographic
-* Disease
 * Dog
 * DragonBall
-* Dune
 * Educator
 * Esports
-* EnglandFootBall
 * File
 * Finance
 * Food
 * Friends
 * FunnyName
 * GameOfThrones
-* Gender
 * Hacker
 * HarryPotter
 * Hipster
@ -104,7 +96,6 @@ Fakers
 * IdNumber
 * Internet
 * Job
-* Kaamelott
 * LeagueOfLegends
 * Lebowski
 * LordOfTheRings
@ -112,12 +103,10 @@ Fakers
 * Matz
 * Music
 * Name
-* Nation
 * Number
 * Options
 * Overwatch
 * PhoneNumber
-* Photography
 * Pokemon
 * Princess Bride
 * Relationship Terms
@ -125,10 +114,8 @@ Fakers
 * Robin
 * RockBand
 * Shakespeare
-* Sip
 * SlackEmoji
 * Space
-* StarCraft
 * StarTrek
 * Stock
 * Superhero
@ -178,7 +165,6 @@ Supported Locales
 * fi-FI
 * fr
 * he
-* hu
 * in-ID
 * it
 * ja
--- a/pom.xml
+++ b/pom.xml
@ -3,7 +3,7 @@
    <groupId>com.github.javafaker</groupId>
    <artifactId>javafaker</artifactId>
    <packaging>jar</packaging>
-    <version>1.0.3-SNAPSHOT</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.
@ -53,7 +53,7 @@
        <dependency>
            <groupId>org.yaml</groupId>
            <artifactId>snakeyaml</artifactId>
-            <version>1.26</version>
+            <version>1.23</version>
            <classifier>android</classifier>
        </dependency>
        <dependency>
--- a/src/main/java/com/github/javafaker/Address.java
+++ b/src/main/java/com/github/javafaker/Address.java
@ -35,10 +35,6 @@ public class Address {
        return faker.bothify(faker.fakeValuesService().resolve("address.postcode", this,faker));
    }

-    public String postcode() {
-        return faker.bothify(faker.fakeValuesService().resolve("address.postcode", this,faker));
-    }
-
    public String zipCodeByState(String stateAbbr) {
        return faker.fakeValuesService().resolve("address.postcode_by_state." + stateAbbr, this, faker);
    }
--- a/src/main/java/com/github/javafaker/AquaTeenHungerForce.java
+++ b/src/main/java/com/github/javafaker/AquaTeenHungerForce.java
@ -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);
-    }
-
-}
--- a/src/main/java/com/github/javafaker/Barcode.java
+++ b/src/main/java/com/github/javafaker/Barcode.java
@ -1,22 +0,0 @@
-package com.github.javafaker;
-
-public class Barcode {
-
-    private Faker faker;
-
-    public Barcode(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String type() {
-        return faker.resolve("barcode.types");
-    }
-
-    public String data(){
-        return faker.resolve("barcode.datas");
-    }
-
-    public String typeAndData(){
-        return faker.resolve("barcode.typeAndData");
-    }
-}
--- a/src/main/java/com/github/javafaker/Basketball.java
+++ b/src/main/java/com/github/javafaker/Basketball.java
@ -1,49 +0,0 @@
-package com.github.javafaker;
-
-/**
- * Generate random components of basketall game, e.g. teams, coaches, positions and players.
- * @author unknown and irakatz
- */
-public class Basketball {
-    private final Faker faker;
-
-    /**
-     * Create a constructor for Basketball.
-     * @param faker The Faker instance for generating random, different kinds of disease, e.g. the internal disease.
-     */
-    protected Basketball(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * Generate random basketball teams
-     * @return Basketball teams
-     */
-    public String teams() {
-        return faker.fakeValuesService().resolve("basketball.teams", this, faker);
-    }
-
-    /**
-     * Generate random coaches in basketball game
-     * @return Basketball coaches
-     */
-    public String coaches() {
-        return faker.fakeValuesService().resolve("basketball.coaches", this, faker);
-    }
-
-    /**
-     * Generate random positions in basketball game
-     * @return Basketball positions
-     */
-    public String positions() {
-        return faker.fakeValuesService().resolve("basketball.positions", this, faker);
-    }
-
-    /**
-     * Generate random basketball players
-     * @return Basketball players
-     */
-    public String players() {
-        return faker.fakeValuesService().resolve("basketball.players", this, faker);
-    }
-}
--- a/src/main/java/com/github/javafaker/BojackHorseman.java
+++ b/src/main/java/com/github/javafaker/BojackHorseman.java
@ -1,43 +0,0 @@
-package com.github.javafaker;
-
-/**
- * Generate random parts in BojackHorseman.
- * @author unknown and irakatz
- */
-
-public class BojackHorseman {
-    private final Faker faker;
-
-    /**
-     * Create a constructor for BojackHorseman.
-     * @param faker The Faker instance for generating random parts in BojackHorseman.
-     */
-    protected BojackHorseman(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * Generate random character's name in BojackHorseman.
-     * @return Characters in BojackHorseman
-     */
-    public String characters() {
-        return faker.fakeValuesService().resolve("bojack_horseman.characters", this, faker);
-    }
-
-    /**
-     * Generate random quotes in BojackHorseman.
-     * @return Quotes in BojackHorseman
-     */
-    public String quotes() {
-        return faker.fakeValuesService().resolve("bojack_horseman.quotes", this, faker);
-    }
-
-    /**
-     * Generate random tongue twisters in BojackHorseman.
-     * @return Tongue twisters in BojackHorseman
-     */
-    public String tongueTwisters() {
-        return faker.fakeValuesService().resolve("bojack_horseman.tongue_twisters", this, faker);
-    }
-
-}
--- a/src/main/java/com/github/javafaker/Coin.java
+++ b/src/main/java/com/github/javafaker/Coin.java
@ -1,17 +0,0 @@
-package com.github.javafaker;
-
-public class Coin {
-
-    private final Faker faker;
-
-    protected Coin(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * @return coin side e.g. "Heads", "Tails".
-     */
-    public String flip() {
-        return faker.fakeValuesService().resolve("coin.flip", this, faker);
-    }
-}
--- a/src/main/java/com/github/javafaker/Company.java
+++ b/src/main/java/com/github/javafaker/Company.java
@ -69,13 +69,13 @@ public class Company {
    }

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

    private String domainName(){
--- a/src/main/java/com/github/javafaker/DateAndTime.java
+++ b/src/main/java/com/github/javafaker/DateAndTime.java
@ -144,40 +144,34 @@ 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);
    }

    /**
-     * Generates a random birthday between 65 and 18 years ago from now.
+     * Generates a random birthday between 65 and 18 years ago.
     *
-     * @return a random birthday between 65 and 18 years ago from now.
+     * @return a random birthday between 65 and 18 years ago.
     */
    public Date birthday() {
        return birthday(DEFAULT_MIN_AGE, DEFAULT_MAX_AGE);
    }

    /**
-     * Generates a random birthday between two ages from now.
+     * Generates a random birthday between two ages.
     *
     * @param minAge
     *            the minimal age
     * @param maxAge
     *            the maximal age
-     * @return a random birthday between {@code minAge} and {@code maxAge} years ago from now.
+     * @return a random birthday between {@code minAge} and {@code maxAge} years ago.
     * @throws IllegalArgumentException
     *             if the {@code maxAge} is lower than {@code minAge}.
     */
    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());
    }
--- a/src/main/java/com/github/javafaker/Disease.java
+++ b/src/main/java/com/github/javafaker/Disease.java
@ -1,73 +0,0 @@
-package com.github.javafaker;
-
-/**
- * Generate random, different kinds of disease.
- */
-public class Disease {
-    private final Faker faker;
-
-    /**
-     * Create a constructor for Disease
-     * @param faker The Faker instance for generating random, different kinds of disease, e.g. the internal disease.
-     */
-    protected Disease(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * Generate random internal disease
-     * @return An internal disease
-     */
-    public String internalDisease() {
-        return faker.fakeValuesService().resolve("disease.internal_disease", this, faker);
-    }
-
-    /**
-     * Generate random neurology disease
-     * @return A neurology disease
-     */
-    public String neurology() {
-        return faker.fakeValuesService().resolve("disease.neurology", this, faker);
-    }
-
-    /**
-     * Generate random surgery disease
-     * @return A surgery disease
-     */
-    public String surgery() {
-        return faker.fakeValuesService().resolve("disease.surgery", this, faker);
-    }
-
-    /**
-     * Generate random paediattics disease
-     * @return A paediatrics disease
-     */
-    public String paediatrics() {
-        return faker.fakeValuesService().resolve("disease.paediatrics", this, faker);
-    }
-
-    /**
-     * Generate random gynecology and obstetrics disease
-     * @return A gynecology and obstetrics disease
-     */
-    public String gynecologyAndObstetrics() {
-        return faker.fakeValuesService().resolve("disease.gynecology_and_obstetrics", this, faker);
-    }
-
-    /**
-     * Generate random ophthalmology and otorhinolaryngology disease
-     * @return A ophthalmology and otorhinolaryngology disease
-     */
-    public String ophthalmologyAndOtorhinolaryngology() {
-        return faker.fakeValuesService().resolve("disease.ophthalmology_and_otorhinolaryngology", this, faker);
-    }
-
-    /**
-     * Generate random dermatolory disease
-     * @return A dermatolory disease
-     */
-    public String dermatolory() {
-        return faker.fakeValuesService().resolve("disease.dermatolory", this, faker);
-    }
-
-}
--- a/src/main/java/com/github/javafaker/Dune.java
+++ b/src/main/java/com/github/javafaker/Dune.java
@ -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;
-        }
-    }
-
-}
--- a/src/main/java/com/github/javafaker/ElderScrolls.java
+++ b/src/main/java/com/github/javafaker/ElderScrolls.java
@ -35,7 +35,4 @@ public class ElderScrolls {
    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);
-    }
 }
--- a/src/main/java/com/github/javafaker/EnglandFootBall.java
+++ b/src/main/java/com/github/javafaker/EnglandFootBall.java
@ -1,18 +0,0 @@
-package com.github.javafaker;
-
-public class EnglandFootBall {
-
-    private final Faker faker;
-
-    protected EnglandFootBall(final Faker faker) {
-        this.faker = faker;
-    }
-
-    public String league() {
-        return faker.fakeValuesService().resolve("englandfootball.leagues",this,faker);
-    }
-
-    public String team() {
-        return faker.fakeValuesService().resolve("englandfootball.teams",this,faker);
-    }
-}
--- a/src/main/java/com/github/javafaker/Faker.java
+++ b/src/main/java/com/github/javafaker/Faker.java
@ -42,11 +42,9 @@ public class Faker {
    private final Hacker hacker;
    private final Options options;
    private final Code code;
-    private final Coin coin;
    private final Finance finance;
    private final Food food;
    private final GameOfThrones gameOfThrones;
-    private final Gender gender;
    private final DateAndTime dateAndTime;
    private final Demographic demographic;
    private final Dog dog;
@ -93,27 +91,13 @@ public class Faker {
    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;
-    private final Kaamelott kaamelott;
-    private final Photography photography;
-    private final StarCraft starCraft;
-    private final BojackHorseman bojackHorseman;
-    private final Disease disease;
-    private final Basketball basketball;
-    private final Barcode barcode;
-    private final Sip sip;
-    private final EnglandFootBall englandfootball;
-    private final Mountain mountain;

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

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

    public Faker(Random random) {
@ -121,16 +105,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);
@ -162,7 +138,6 @@ public class Faker {
        this.finance = new Finance(this);
        this.food = new Food(this);
        this.gameOfThrones = new GameOfThrones(this);
-        this.gender = new Gender(this);
        this.dateAndTime = new DateAndTime(this);
        this.demographic = new Demographic(this);
        this.dog = new Dog(this);
@ -170,7 +145,6 @@ public class Faker {
        this.shakespeare = new Shakespeare(this);
        this.slackEmoji = new SlackEmoji(this);
        this.space = new Space(this);
-        this.coin = new Coin(this);
        this.superhero = new Superhero(this);
        this.team = new Team(this);
        this.bool = new Bool(this);
@ -209,20 +183,6 @@ public class Faker {
        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);
-        this.kaamelott = new Kaamelott(this);
-        this.photography = new Photography(this);
-        this.starCraft = new StarCraft(this);
-        this.bojackHorseman = new BojackHorseman(this);
-        this.disease = new Disease(this);
-        this.basketball = new Basketball(this);
-        this.barcode = new Barcode(this);
-        this.sip = new Sip(this);
-        this.englandfootball = new EnglandFootBall(this);
-        this.mountain = new Mountain(this);
    }

    /**
@ -447,10 +407,6 @@ public class Faker {
        return code;
    }

-    public Coin coin() {
-        return coin;
-    }
-
    public File file() {
        return file;
    }
@ -471,10 +427,6 @@ public class Faker {
        return gameOfThrones;
    }

-    public Gender gender() {
-        return gender;
-    }
-
    public DateAndTime date() {
        return dateAndTime;
    }
@ -515,7 +467,9 @@ public class Faker {
        return team;
    }

-    public Beer beer() { return beer; }
+    public Beer beer() {
+        return beer;
+    }

    public University university() {
        return university;
@ -625,20 +579,14 @@ public class Faker {
        return lebowski;
    }

-    public Medical medical() {
-        return medical;
-    }
+    public Medical medical(){return medical;}

-    public Country country() {
-        return country;
-    }
+    public Country country(){ return country;}

-    public Animal animal() {
-        return animal;
-    }
+    public Animal animal(){ return animal; }

    public BackToTheFuture backToTheFuture() {
-        return backToTheFuture;
+        return  backToTheFuture;
    }

    public PrincessBride princessBride() {
@ -648,49 +596,7 @@ public class Faker {
    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 Kaamelott kaamelott() {
-        return kaamelott;
-    }
-
-    public Photography photography() {
-        return  photography;
-    }
-
-    public StarCraft starCraft() {
-        return starCraft;
-    }
-
-    public BojackHorseman bojackHorseman() { return bojackHorseman; }
-
-    public Disease disease() {return disease; }
-
-    public Basketball basketball() { return basketball; }
-
-    public Barcode barcode() { return barcode; }
-
-    public Sip sip() { return sip; }
-
-    public EnglandFootBall englandfootball() { return englandfootball; }
-
-    public Mountain mountain() { return mountain; }
-
+    
    public String resolve(String key) {
        return this.fakeValuesService.resolve(key, this, this);
    }
--- a/src/main/java/com/github/javafaker/File.java
+++ b/src/main/java/com/github/javafaker/File.java
@ -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();
    }
 }
--- a/src/main/java/com/github/javafaker/Food.java
+++ b/src/main/java/com/github/javafaker/Food.java
@ -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);
--- a/src/main/java/com/github/javafaker/Gender.java
+++ b/src/main/java/com/github/javafaker/Gender.java
@ -1,41 +0,0 @@
-package com.github.javafaker;
-
-/**
- * This class is used to generate gender randomly.
- *
- */
-
-public class Gender {
-    private final Faker faker;
-
-    protected Gender(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * This method returns a gender type
-     *
-     * @return a string of gender type
-     */
-    public String types() {
-        return faker.fakeValuesService().fetchString("gender.types");
-    }
-
-    /**
-     * This method returns a binary gender type
-     *
-     * @return a string of binary gender type
-     */
-    public String binaryTypes() {
-        return faker.fakeValuesService().fetchString("gender.binary_types");
-    }
-
-    /**
-     * This method returns a short binary gender type
-     *
-     * @return a string of short binary gender type
-     */
-    public String shortBinaryTypes() {
-        return faker.fakeValuesService().fetchString("gender.short_binary_types");
-    }
-}
--- a/src/main/java/com/github/javafaker/HarryPotter.java
+++ b/src/main/java/com/github/javafaker/HarryPotter.java
@ -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");
-    }
 }
--- a/src/main/java/com/github/javafaker/Internet.java
+++ b/src/main/java/com/github/javafaker/Internet.java
@ -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()
-        );
+        });
    }

    /**
--- a/src/main/java/com/github/javafaker/Kaamelott.java
+++ b/src/main/java/com/github/javafaker/Kaamelott.java
@ -1,17 +0,0 @@
-package com.github.javafaker;
-
-public class Kaamelott {
-    private final Faker faker;
-
-    protected Kaamelott(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String character() {
-        return faker.fakeValuesService().resolve("kaamelott.characters", this, faker);
-    }
-
-    public String quote() {
-        return faker.fakeValuesService().resolve("kaamelott.quotes", this, faker);
-    }
-}
--- a/src/main/java/com/github/javafaker/Lorem.java
+++ b/src/main/java/com/github/javafaker/Lorem.java
@ -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) {
--- a/src/main/java/com/github/javafaker/Mountain.java
+++ b/src/main/java/com/github/javafaker/Mountain.java
@ -1,17 +0,0 @@
-package com.github.javafaker;
-
-public class Mountain {
-    private final Faker faker;
-
-    protected Mountain(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String name() {
-        return faker.fakeValuesService().resolve("mountain.name", this, faker);
-    }
-
-    public String range() {
-        return faker.fakeValuesService().resolve("mountain.range", this, faker);
-    }
-}
--- a/src/main/java/com/github/javafaker/Name.java
+++ b/src/main/java/com/github/javafaker/Name.java
@ -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);
-    }
 }
--- a/src/main/java/com/github/javafaker/Nation.java
+++ b/src/main/java/com/github/javafaker/Nation.java
@ -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);
-    }
-
-}
--- a/src/main/java/com/github/javafaker/Number.java
+++ b/src/main/java/com/github/javafaker/Number.java
@ -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();
    }
    
    /**
--- a/src/main/java/com/github/javafaker/Photography.java
+++ b/src/main/java/com/github/javafaker/Photography.java
@ -1,76 +0,0 @@
-package com.github.javafaker;
-
-/**
- * Provides photography related strings.
- */
-public class Photography {
-
-    private final Faker faker;
-
-    protected Photography(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * @return a photography term.
-     */
-    public String term() {
-        return faker.fakeValuesService().fetchString("photography.term");
-    }
-
-    /**
-     * @return a photography brand.
-     */
-    public String brand() {
-        return faker.fakeValuesService().fetchString("photography.brand");
-    }
-
-    /**
-     * @return a name of camera model/make.
-     */
-    public String camera() {
-        return faker.fakeValuesService().fetchString("photography.camera");
-    }
-
-    /**
-     * @return some lens description like 500mm/8.
-     */
-    public String lens() {
-        return faker.fakeValuesService().fetchString("photography.lens");
-    }
-
-    /**
-     * @return a photography genre.
-     */
-    public String genre() {
-        return faker.fakeValuesService().fetchString("photography.genre");
-    }
-
-    /**
-     * @return some string to tag an image.
-     */
-    public String imageTag() {
-        return faker.fakeValuesService().fetchString("photography.imagetag");
-    }
-
-    /**
-     * @return some aperture description like f/1.4 .
-     */
-    public String aperture() {
-        return faker.fakeValuesService().fetchString("photography.aperture");
-    }
-
-    /**
-     * @return some shutter description like 1/25 .
-     */
-    public String shutter() {
-        return faker.fakeValuesService().fetchString("photography.shutter");
-    }
-
-    /**
-     * @return some ISO value like 3200.
-     */
-    public String iso() {
-        return faker.fakeValuesService().fetchString("photography.iso");
-    }
-}
--- a/src/main/java/com/github/javafaker/ProgrammingLanguage.java
+++ b/src/main/java/com/github/javafaker/ProgrammingLanguage.java
@ -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);
-    }
-
-}
--- a/src/main/java/com/github/javafaker/Relationships.java
+++ b/src/main/java/com/github/javafaker/Relationships.java
@ -1,60 +1,60 @@
-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());
-        }
-    }
-
-}
+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 = Relationships.class.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());
+        }
+    }
+    
+}
--- a/src/main/java/com/github/javafaker/Sip.java
+++ b/src/main/java/com/github/javafaker/Sip.java
@ -1,215 +0,0 @@
-package com.github.javafaker;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import java.util.ArrayList;
-
-/**
- * Faker class for generating Session Initiation Protocol (SIP) related data.
- *
- * @author TomerFi
- */
-public final class Sip {
-    private final Faker faker;
-    private final ArrayList<Integer> portPool;
-
-    protected Sip(final Faker faker) {
-        this.faker = faker;
-        int port = 40000;
-        portPool = new ArrayList<Integer>();
-        while (port <= 50000) {
-            portPool.add(port);
-            port = port + 2;
-        }
-    }
-
-    /**
-     * The various SIP methods are listed in https://en.wikipedia.org/wiki/Session_Initiation_Protocol.
-     *
-     * @return a SIP method String, e.g. {@code INVITE}.
-     */
-    public String method() {
-        return faker.resolve("sip.methods");
-    }
-
-    /**
-     * Content types are based on https://tools.ietf.org/html/rfc5621 and
-     * https://tools.ietf.org/html/rfc3261.
-     *
-     * @return a SIP content-type declaration String, e.g. {@code application/sdp}
-     */
-    public String contentType() {
-        return faker.resolve("sip.content.types");
-    }
-
-    /**
-     * Get a 4 digit random port for SIP messaging.
-     *
-     * @return a SIP messaging port int, e.g. 5060.
-     */
-    public int messagingPort() {
-        return faker.random().nextInt(1000, 9999);
-    }
-
-    /**
-     * Get a 5 digit positive even port for rtp udp communication.
-     *
-     * @return an RTP UDP 5 digit port int, e.g. 40002.
-     */
-    public int rtpPort() {
-        return portPool.get(faker.random().nextInt(0, portPool.size()));
-    }
-
-    /**
-     * Proviosional code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP provisioan response code between 100 and 199 int, e.g. {@code 180}.
-     */
-    public int provisionalResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.provisional"));
-    }
-
-    /**
-     * Success code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP success response code between 200 and 299 int, e.g. {@code 200}.
-     */
-    public int successResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.success"));
-    }
-
-    /**
-     * Redirection code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP redirection response code between 300 and 399 int, e.g. {@code 301}.
-     */
-    public int redirectResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.redirection"));
-    }
-
-    /**
-     * Client error code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP client error response code between 400 and 499 int, e.g. {@code 486}.
-     */
-    public int clientErrorResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.clientError"));
-    }
-
-    /**
-     * Server error code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP server error response code between 500 and 599 int, e.g. {@code 503}.
-     */
-    public int serverErrorResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.serverError"));
-    }
-
-    /**
-     * Global error code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP global error response code between 600 and 699 int, e.g. {@code 608}.
-     */
-    public int globalErrorResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.globalError"));
-    }
-
-    /**
-     * Proviosional phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP provisional response phrase String, e.g. {@code Ringing}.
-     */
-    public String provisionalResponsePhrase() {
-        return faker.resolve("sip.response.phrases.provisional");
-    }
-
-    /**
-     * Success phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP success response phrase String, e.g. {@code OK}.
-     */
-    public String successResponsePhrase() {
-        return faker.resolve("sip.response.phrases.success");
-    }
-
-    /**
-     * Redirection phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP redirection response phrase String, e.g. {@code Moved Permanently}.
-     */
-    public String redirectResponsePhrase() {
-        return faker.resolve("sip.response.phrases.redirection");
-    }
-
-    /**
-     * Client error phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP client error response phrase String, e.g. {@code Busy Here}.
-     */
-    public String clientErrorResponsePhrase() {
-        return faker.resolve("sip.response.phrases.clientError");
-    }
-
-    /**
-     * Server error phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP server erro response phrase String, e.g. {@code Service Unavailable}.
-     */
-    public String serverErrorResponsePhrase() {
-        return faker.resolve("sip.response.phrases.serverError");
-    }
-
-    /**
-     * Server error phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP global error response phrase String, e.g. {@code Rejected}.
-     */
-    public String globalErrorResponsePhrase() {
-        return faker.resolve("sip.response.phrases.globalError");
-    }
-
-    /**
-     * Body example of SDP type can be found in https://tools.ietf.org/html/rfc5621.
-     *
-     * @return a fake SDP type SIP body String.
-     */
-    public String bodyString() {
-        return "v=0\n" +
-        "o=" + faker.name().firstName() + " " + faker.internet().uuid() + " IN IP4 " + faker.internet().domainName() + "\n" +
-        "s=-\n" +
-        "c=IN IP4 " + faker.internet().ipV4Address() + "\n" +
-        "t=0 0\n" +
-        "m=audio " + rtpPort() + " RTP/AVP 0\n" +
-        "a=rtpmap:0 PCMU/8000";
-    }
-
-    /**
-     * Body example of SDP type can be found in https://tools.ietf.org/html/rfc5621.
-     *
-     * @return a fake SDP type SIP body byte array.
-     */
-    public byte[] bodyBytes() {
-        return bodyString().getBytes(UTF_8);
-    }
-
-    /**
-     * Return a valid name address to use with {@code to/from} headers.
-     *
-     * @return a valid name address String, e.g. {@code <sip:fakeName@10.1.2.3:5060>}.
-     */
-    public String nameAddress() {
-        return "<sip:" + faker.name().firstName() + "@" + faker.internet().ipV4Address() + ":" + messagingPort() + ">";
-    }
-}
--- a/src/main/java/com/github/javafaker/StarCraft.java
+++ b/src/main/java/com/github/javafaker/StarCraft.java
@ -1,27 +0,0 @@
-package com.github.javafaker;
-
-public class StarCraft {
-
-    private final Faker faker;
-
-    protected StarCraft(final Faker faker) {
-        this.faker = faker;
-    }
-
-    public String unit() {
-        return faker.fakeValuesService().resolve("starcraft.units", this, faker);
-    }
-
-    public String building() {
-        return faker.fakeValuesService().resolve("starcraft.buildings", this, faker);
-    }
-
-    public String character() {
-        return faker.fakeValuesService().resolve("starcraft.characters", this, faker);
-    }
-
-    public String planet() {
-        return faker.fakeValuesService().resolve("starcraft.planets", this, faker);
-    }
-
-}
--- a/src/main/java/com/github/javafaker/StarTrek.java
+++ b/src/main/java/com/github/javafaker/StarTrek.java
@ -22,8 +22,4 @@ public class StarTrek {
    public String villain() {
        return faker.fakeValuesService().resolve("star_trek.villain", this, faker);
    }
-
-    public String klingon() {
-        return faker.fakeValuesService().resolve("star_trek.klingon", this, faker);
-    }
 }
--- a/src/main/java/com/github/javafaker/idnumbers/EnIdNumber.java
+++ b/src/main/java/com/github/javafaker/idnumbers/EnIdNumber.java
@ -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;
            }
--- a/src/main/java/com/github/javafaker/service/FakeValues.java
+++ b/src/main/java/com/github/javafaker/service/FakeValues.java
@ -2,7 +2,6 @@ package com.github.javafaker.service;

 import org.yaml.snakeyaml.Yaml;

-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
@ -76,11 +75,6 @@ public class FakeValues implements FakeValuesInterface {
        if (localeBased == null) {
            localeBased = (Map) valuesMap.get(filename);
        }
-        try {
-            stream.close();
-        } catch (IOException ex){
-            return null;
-        }
        return (Map) localeBased.get("faker");
    }

--- a/src/main/java/com/github/javafaker/service/FakeValuesService.java
+++ b/src/main/java/com/github/javafaker/service/FakeValuesService.java
@ -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");

@ -72,7 +72,7 @@ public class FakeValuesService {
                }
                all.add(fakeValuesGrouping);
            } else {
-                all.add(new FakeValues(l));
+                all.add(new FakeValues(locale));
            }
        }

@ -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;

--- a/src/main/java/com/github/javafaker/service/RandomService.java
+++ b/src/main/java/com/github/javafaker/service/RandomService.java
@ -60,18 +60,11 @@ public class RandomService {
    }

    public String hex(int length) {
-        if (length <= 0) {
-            return ""; // Keep the existing behavior instead of throwing an error.
+        char[] hexValues = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+        StringBuilder hexString = new StringBuilder();
+        for(int i = 0; i < length; i++) {
+            hexString.append(hexValues[nextInt(hexValues.length)]);
        }
-        final char[] hexChars = new char[length];
-        for (int i = 0; i < length; i++) {
-            final int nextHex = nextInt(16);
-            if (nextHex < 10) {
-                hexChars[i] = (char) ('0' + nextHex);
-            } else {
-                hexChars[i] = (char) ('A' + nextHex - 10);
-            }
-        }
-        return new String(hexChars);
+        return hexString.toString();
    }
 }
--- a/src/main/java/com/github/javafaker/service/files/EnFile.java
+++ b/src/main/java/com/github/javafaker/service/files/EnFile.java
@ -35,9 +35,7 @@ public class EnFile {
            "artist.yml",
            "aviation.yml",
            "back_to_the_future.yml",
-            "barcode.yml",
            "bank.yml",
-            "basketball.yml",
            "beer.yml",
            "bojack_horseman.yml",
            "book.yml",
@ -64,7 +62,6 @@ public class EnFile {
            "demographic.yml",
            "dessert.yml",
            "device.yml",
-            "disease.yml",
            "dota.yml",
            "dr_who.yml",
            "dragon_ball.yml",
@ -74,7 +71,6 @@ public class EnFile {
            "elder_scrolls.yml",
            "electrical_components.yml",
            "esport.yml",
-            "englandfootball.yml",
            "fallout.yml",
            "family_guy.yml",
            "famous_last_words.yml",
@ -120,7 +116,6 @@ public class EnFile {
            "military.yml",
            "most_interesting_man_in_the_world.yml",
            "movie.yml",
-            "mountain.yml",
            "music.yml",
            "myst.yml",
            "name.yml",
@ -132,7 +127,6 @@ public class EnFile {
            "parks_and_rec.yml",
            "phish.yml",
            "phone_number.yml",
-            "photography.yml",
            "pokemon.yml",
            "princess_bride.yml",
            "programming_language.yml",
@ -148,13 +142,11 @@ public class EnFile {
            "silicon_valley.yml",
            "simpsons.yml",
            "singular_siegler.yml",
-            "sip.yml",
            "slack_emoji.yml",
            "sonic_the_hedgehog.yml",
            "source.yml",
            "south_park.yml",
            "space.yml",
-            "starcraft.yml",
            "star_trek.yml",
            "star_wars.yml",
            "stargate.yml",
@ -178,7 +170,6 @@ public class EnFile {
            "verbs.yml",
            "weather.yml",
            "witcher.yml",
-            "kaamelott.yml",
            "world_cup.yml",
            "world_of_warcraft.yml",
            "yoda.yml",
--- a/src/main/resources/cs-CZ.yml
+++ b/src/main/resources/cs-CZ.yml
--- a/src/main/resources/en/bank.yml
+++ b/src/main/resources/en/bank.yml
--- a/src/main/resources/en/barcode.yml
+++ b/src/main/resources/en/barcode.yml
@ -1,10 +0,0 @@
-en:
-  faker:
-    barcode:
-      types: ['UPC', 'UPC-A', 'UPC-E', 'Code128', 'Code39','Code93', 'EAN', 'EAN-13', 'EAN-8', 'JAN-13', 'ISBN', 'ISSN',
-              'ITF', 'Codabar', 'Ames Code', 'NW-7', 'Monarch', 'Code 2 of 7', 'Rationalized', 'ANSI/AIM BC3-1995', 'USD-4',
-              'GS1 Databar', 'MSI Plessey', 'UCC']
-      datas: ['12345678', '09876543', '05755069', '15008444', '69503172', '05082366', '29951287', '37457367',
-              '87164772', '17217165', '56462327', '35186895', '16957481', '68124245', '28664694', '12372549',
-              '02527355']
-      typeAndData: "#{barcode.types} #{barcode.datas}"
--- a/src/main/resources/en/coin.yml
+++ b/src/main/resources/en/coin.yml
@ -1,5 +1,6 @@
 en:
  faker:
    coin:
-      flip: ["Heads", "Tails"]
-
+      flip:
+        - Heads
+        - Tails
--- a/src/main/resources/en/country.yml
+++ b/src/main/resources/en/country.yml
@ -3,7 +3,7 @@ en:
    country:
      code2: ['af', 'al', 'dz', 'ad', 'ao', 'ag', 'ar', 'am', 'au', 'at', 'az', 'bs', 'bh', 'bd', 'bb', 'by', 'be', 'bz', 'bj', 'bt', 'bo', 'ba', 'bw', 'br', 'bn', 'bg', 'bf', 'bi', 'cv', 'kh', 'cm', 'ca', 'cf', 'td', 'cl', 'cn', 'co', 'km', 'cg', 'cd', 'cr', 'ci', 'hr', 'cu', 'cy', 'cz', 'dk', 'dj', 'dm', 'do', 'ec', 'eg', 'sv', 'gq', 'er', 'ee', 'sz', 'et', 'fj', 'fi', 'fr', 'ga', 'gm', 'ge', 'de', 'gh', 'gr', 'gd', 'gt', 'gn', 'gw', 'gy', 'ht', 'hn', 'hu', 'is', 'in', 'id', 'ir', 'iq', 'ie', 'il', 'it', 'jm', 'jp', 'jo', 'kz', 'ke', 'ki', 'kp', 'kr', 'kw', 'kg', 'la', 'lv', 'lb', 'ls', 'lr', 'ly', 'li', 'lt', 'lu', 'mk', 'mg', 'mw', 'my', 'mv', 'ml', 'mt', 'mh', 'mr', 'mu', 'mx', 'fm', 'md', 'mc', 'mn', 'me', 'ma', 'mz', 'mm', 'na', 'nr', 'np', 'nl', 'nz', 'ni', 'ne', 'ng', 'no', 'om', 'pk', 'pw', 'pa', 'pg', 'py', 'pe', 'ph', 'pl', 'pt', 'qa', 'ro', 'ru', 'rw', 'kn', 'lc', 'vc', 'ws', 'sm', 'st', 'sa', 'sn', 'rs', 'sc', 'sl', 'sg', 'sk', 'si', 'sb', 'so', 'za', 'ss', 'es', 'lk', 'sd', 'sr', 'se', 'ch', 'sy', 'tj', 'tz', 'th', 'tl', 'tg', 'to', 'tt', 'tn', 'tr', 'tm', 'tv', 'ug', 'ua', 'ae', 'gb', 'us', 'uy', 'uz', 'vu', 've', 'vn', 'ye', 'zm', 'zw']
      code3: ['afg', 'alb', 'dza', 'and', 'ago', 'atg', 'arg', 'arm', 'aus', 'aut', 'aze', 'bhs', 'bhr', 'bgd', 'brb', 'blr', 'bel', 'blz', 'ben', 'btn', 'bol', 'bih', 'bwa', 'bra', 'brn', 'bgr', 'bfa', 'bdi', 'cpv', 'khm', 'cmr', 'can', 'caf', 'tcd', 'chl', 'chn', 'col', 'com', 'cog', 'cod', 'cri', 'civ', 'hrv', 'cub', 'cyp', 'cze', 'dnk', 'dji', 'dma', 'dom', 'ecu', 'egy', 'slv', 'gnq', 'eri', 'est', 'swz', 'eth', 'fji', 'fin', 'fra', 'gab', 'gmb', 'geo', 'deu', 'gha', 'grc', 'grd', 'gtm', 'gin', 'gnb', 'guy', 'hti', 'hnd', 'hun', 'isl', 'ind', 'idn', 'irn', 'irq', 'irl', 'isr', 'ita', 'jam', 'jpn', 'jor', 'kaz', 'ken', 'kir', 'prk', 'kor', 'kwt', 'kgz', 'lao', 'lva', 'lbn', 'lso', 'lbr', 'lby', 'lie', 'ltu', 'lux', 'mkd', 'mdg', 'mwi', 'mys', 'mdv', 'mli', 'mlt', 'mhl', 'mrt', 'mus', 'mex', 'fsm', 'mda', 'mco', 'mng', 'mne', 'mar', 'moz', 'mmr', 'nam', 'nru', 'npl', 'nld', 'nzl', 'nic', 'ner', 'nga', 'nor', 'omn', 'pak', 'plw', 'pan', 'png', 'pry', 'per', 'phl', 'pol', 'prt', 'qat', 'rou', 'rus', 'rwa', 'kna', 'lca', 'vct', 'wsm', 'smr', 'stp', 'sau', 'sen', 'srb', 'syc', 'sle', 'sgp', 'svk', 'svn', 'slb', 'som', 'zaf', 'ssd', 'esp', 'lka', 'sdn', 'sur', 'swe', 'che', 'syr', 'tjk', 'tza', 'tha', 'tls', 'tgo', 'ton', 'tto', 'tun', 'tur', 'tkm', 'tuv', 'uga', 'ukr', 'are', 'gbr', 'usa', 'ury', 'uzb', 'vut', 'ven', 'vnm', 'yem', 'zmb', 'zwe']
-      name: ["Afghanistan", "Albania", "Algeria", "Andorra", "Angola", "Antigua and Barbuda", "Argentina", "Armenia", "Australia", "Austria", "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin", "Bhutan", "Bolivia (Plurinational State of)", "Bosnia and Herzegovina", "Botswana", "Brazil", "Brunei Darussalam", "Bulgaria", "Burkina Faso", "Burundi", "Cabo Verde", "Cambodia", "Cameroon", "Canada", "Central African Republic", "Chad", "Chile", "China", "Colombia", "Comoros", "Congo", "Congo, Democratic Republic of the", "Costa Rica", "Côte d'Ivoire", "Croatia", "Cuba", "Cyprus", "Czechia", "Denmark", "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Eswatini", "Ethiopia", "Fiji", "Finland", "France", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Greece", "Grenada", "Guatemala", "Guinea", "Guinea-Bissau", "Guyana", "Haiti", "Honduras", "Hungary", "Iceland", "India", "Indonesia", "Iran (Islamic Republic of)", "Iraq", "Ireland", "Israel", "Italy", "Jamaica", "Japan", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "Korea (Democratic People's Republic of)", "Korea, Republic of", "Kuwait", "Kyrgyzstan", "Lao People's Democratic Republic", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg", "Macedonia, the former Yugoslav Republic of", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Mauritania", "Mauritius", "Mexico", "Micronesia (Federated States of)", "Moldova, Republic of", "Monaco", "Mongolia", "Montenegro", "Morocco", "Mozambique", "Myanmar", "Namibia", "Nauru", "Nepal", "Netherlands", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Norway", "Oman", "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland", "Portugal", "Qatar", "Romania", "Russian Federation", "Rwanda", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "Samoa", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa", "South Sudan", "Spain", "Sri Lanka", "Sudan", "Suriname", "Sweden", "Switzerland", "Syrian Arab Republic", "Tajikistan", "Tanzania, United Republic of", "Thailand", "Timor-Leste", "Togo", "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey", "Turkmenistan", "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom of Great Britain and Northern Ireland", "United States of America", "Uruguay", "Uzbekistan", "Vanuatu", "Venezuela (Bolivarian Republic of)", "Viet Nam", "Yemen", "Zambia", "Zimbabwe"]
+      name: ["Afghanistan", "Albania", "Algeria", "Andorra", "Angola", "Antigua and Barbuda", "Argentina", "Armenia", "Australia", "Austria", "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin", "Bhutan", "Bolivia (Plurinational State of)", "Bosnia and Herzegovina", "Botswana", "Brazil", "Brunei Darussalam", "Bulgaria", "Burkina Faso", "Burundi", "Cabo Verde", "Cambodia", "Cameroon", "Canada", "Central African Republic", "Chad", "Chile", "China", "Colombia", "Comoros", "Congo", "Congo, Democratic Republic of the", "Costa Rica", "C√¥te d'Ivoire", "Croatia", "Cuba", "Cyprus", "Czechia", "Denmark", "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Eswatini", "Ethiopia", "Fiji", "Finland", "France", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Greece", "Grenada", "Guatemala", "Guinea", "Guinea-Bissau", "Guyana", "Haiti", "Honduras", "Hungary", "Iceland", "India", "Indonesia", "Iran (Islamic Republic of)", "Iraq", "Ireland", "Israel", "Italy", "Jamaica", "Japan", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "Korea (Democratic People's Republic of)", "Korea, Republic of", "Kuwait", "Kyrgyzstan", "Lao People's Democratic Republic", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg", "Macedonia, the former Yugoslav Republic of", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Mauritania", "Mauritius", "Mexico", "Micronesia (Federated States of)", "Moldova, Republic of", "Monaco", "Mongolia", "Montenegro", "Morocco", "Mozambique", "Myanmar", "Namibia", "Nauru", "Nepal", "Netherlands", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Norway", "Oman", "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland", "Portugal", "Qatar", "Romania", "Russian Federation", "Rwanda", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "Samoa", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa", "South Sudan", "Spain", "Sri Lanka", "Sudan", "Suriname", "Sweden", "Switzerland", "Syrian Arab Republic", "Tajikistan", "Tanzania, United Republic of", "Thailand", "Timor-Leste", "Togo", "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey", "Turkmenistan", "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom of Great Britain and Northern Ireland", "United States of America", "Uruguay", "Uzbekistan", "Vanuatu", "Venezuela (Bolivarian Republic of)", "Viet Nam", "Yemen", "Zambia", "Zimbabwe"]
      capital: ["Hargeisa", "King Edward Point", "Port-aux-Fran√ßais", "Jerusalem", "Mariehamn", "Yaren", "Marigot", "Atafu", "El-Aai√∫n", "Kabul", "Tirana", "Algiers", "Pago Pago", "Andorra la Vella", "Luanda", "The Valley", "Saint John's", "Buenos Aires", "Yerevan", "Oranjestad", "Canberra", "Vienna", "Baku", "Nassau", "Manama", "Dhaka", "Bridgetown", "Minsk", "Brussels", "Belmopan", "Porto-Novo", "Hamilton", "Thimphu", "La Paz", "Sarajevo", "Gaborone", "Brasilia", "Road Town", "Bandar Seri Begawan", "Sofia", "Ouagadougou", "Rangoon", "Bujumbura", "Phnom Penh", "Yaounde", "Ottawa", "Praia", "George Town", "Bangui", "N'Djamena", "Santiago", "Beijing", "The Settlement", "West Island", "Bogota", "Moroni", "Kinshasa", "Brazzaville", "Avarua", "San Jose", "Yamoussoukro", "Zagreb", "Havana", "Willemstad", "Nicosia", "Prague", "Copenhagen", "Djibouti", "Roseau", "Santo Domingo", "Quito", "Cairo", "San Salvador", "Malabo", "Asmara", "Tallinn", "Addis Ababa", "Stanley", "Torshavn", "Suva", "Helsinki", "Paris", "Papeete", "Libreville", "Banjul", "Tbilisi", "Berlin", "Accra", "Gibraltar", "Athens", "Nuuk", "Saint George's", "Hagatna", "Guatemala City", "Saint Peter Port", "Conakry", "Bissau", "Georgetown", "Port-au-Prince", "Vatican City", "Tegucigalpa", "Budapest", "Reykjavik", "New Delhi", "Jakarta", "Tehran", "Baghdad", "Dublin", "Douglas", "Jerusalem", "Rome", "Kingston", "Tokyo", "Saint Helier", "Amman", "Astana", "Nairobi", "Tarawa", "Pyongyang", "Seoul", "Pristina", "Kuwait City", "Bishkek", "Vientiane", "Riga", "Beirut", "Maseru", "Monrovia", "Tripoli", "Vaduz", "Vilnius", "Luxembourg", "Skopje", "Antananarivo", "Lilongwe", "Kuala Lumpur", "Male", "Bamako", "Valletta", "Majuro", "Nouakchott", "Port Louis", "Mexico City", "Palikir", "Chisinau", "Monaco", "Ulaanbaatar", "Podgorica", "Plymouth", "Rabat", "Maputo", "Windhoek", "Kathmandu", "Amsterdam", "Noumea", "Wellington", "Managua", "Niamey", "Abuja", "Alofi", "Kingston", "Saipan", "Oslo", "Muscat", "Islamabad", "Melekeok", "Panama City", "Port Moresby", "Asuncion", "Lima", "Manila", "Adamstown", "Warsaw", "Lisbon", "San Juan", "Doha", "Bucharest", "Moscow", "Kigali", "Gustavia", "Jamestown", "Basseterre", "Castries", "Saint-Pierre", "Kingstown", "Apia", "San Marino", "Sao Tome", "Riyadh", "Dakar", "Belgrade", "Victoria", "Freetown", "Singapore", "Philipsburg", "Bratislava", "Ljubljana", "Honiara", "Mogadishu", "Pretoria", "Juba", "Madrid", "Colombo", "Khartoum", "Paramaribo", "Longyearbyen", "Mbabane", "Stockholm", "Bern", "Damascus", "Taipei", "Dushanbe", "Dar es Salaam", "Bangkok", "Dili", "Lome", "Nuku'alofa", "Port of Spain", "Tunis", "Ankara", "Ashgabat", "Grand Turk", "Funafuti", "Kampala", "Kyiv", "Abu Dhabi", "London", "Washington", "Montevideo", "Tashkent", "Port-Vila", "Caracas", "Hanoi", "Charlotte Amalie", "Mata-Utu", "Sanaa", "Lusaka", "Harare", "Washington", "North Nicosia", "Diego Garcia"]
      currency: ["Afghani", "Euro", "Lek", "Algerian Dinar", "US Dollar", "Euro", "Kwanza", "East Caribbean Dollar", "No universal currency", "East Caribbean Dollar", "Argentine Peso", "Armenian Dram", "Aruban Florin", "Australian Dollar", "Euro", "Azerbaijan Manat", "Bahamian Dollar", "Bahraini Dinar", "Taka", "Barbados Dollar", "Belarusian Ruble", "Euro", "Belize Dollar", "CFA Franc BCEAO", "Bermudian Dollar", "Indian Rupee", "Ngultrum", "Boliviano", "Mvdol", "US Dollar", "Convertible Mark", "Pula", "Norwegian Krone", "Brazilian Real", "US Dollar", "Brunei Dollar", "Bulgarian Lev", "CFA Franc BCEAO", "Burundi Franc", "Cabo Verde Escudo", "Riel", "CFA Franc BEAC", "Canadian Dollar", "Cayman Islands Dollar", "CFA Franc BEAC", "CFA Franc BEAC", "Chilean Peso", "Unidad de Fomento", "Yuan Renminbi", "Australian Dollar", "Australian Dollar", "Colombian Peso", "Unidad de Valor Real", "Comorian Franc ", "Congolese Franc", "CFA Franc BEAC", "New Zealand Dollar", "Costa Rican Colon", "CFA Franc BCEAO", "Kuna", "Cuban Peso", "Peso Convertible", "Netherlands Antillean Guilder", "Euro", "Czech Koruna", "Danish Krone", "Djibouti Franc", "East Caribbean Dollar", "Dominican Peso", "US Dollar", "Egyptian Pound", "El Salvador Colon", "US Dollar", "CFA Franc BEAC", "Nakfa", "Euro", "Ethiopian Birr", "Euro", "Falkland Islands Pound", "Danish Krone", "Fiji Dollar", "Euro", "Euro", "Euro", "CFP Franc", "Euro", "CFA Franc BEAC", "Dalasi", "Lari", "Euro", "Ghana Cedi", "Gibraltar Pound", "Euro", "Danish Krone", "East Caribbean Dollar", "Euro", "US Dollar", "Quetzal", "Pound Sterling", "Guinean Franc", "CFA Franc BCEAO", "Guyana Dollar", "Gourde", "US Dollar", "Australian Dollar", "Euro", "Lempira", "Hong Kong Dollar", "Forint", "Iceland Krona", "Indian Rupee", "Rupiah", "SDR (Special Drawing Right)", "Iranian Rial", "Iraqi Dinar", "Euro", "Pound Sterling", "New Israeli Sheqel", "Euro", "Jamaican Dollar", "Yen", "Pound Sterling", "Jordanian Dinar", "Tenge", "Kenyan Shilling", "Australian Dollar", "North Korean Won", "Won", "Kuwaiti Dinar", "Som", "Lao Kip", "Euro", "Lebanese Pound", "Loti", "Rand", "Liberian Dollar", "Libyan Dinar", "Swiss Franc", "Euro", "Euro", "Pataca", "Denar", "Malagasy Ariary", "Malawi Kwacha", "Malaysian Ringgit", "Rufiyaa", "CFA Franc BCEAO", "Euro", "US Dollar", "Euro", "Ouguiya", "Mauritius Rupee", "Euro", "ADB Unit of Account", "Mexican Peso", "Mexican Unidad de Inversion (UDI)", "US Dollar", "Moldovan Leu", "Euro", "Tugrik", "Euro", "East Caribbean Dollar", "Moroccan Dirham", "Mozambique Metical", "Kyat", "Namibia Dollar", "Rand", "Australian Dollar", "Nepalese Rupee", "Euro", "CFP Franc", "New Zealand Dollar", "Cordoba Oro", "CFA Franc BCEAO", "Naira", "New Zealand Dollar", "Australian Dollar", "US Dollar", "Norwegian Krone", "Rial Omani", "Pakistan Rupee", "US Dollar", "No universal currency", "Balboa", "US Dollar", "Kina", "Guarani", "Sol", "Philippine Peso", "New Zealand Dollar", "Zloty", "Euro", "US Dollar", "Qatari Rial", "Euro", "Romanian Leu", "Russian Ruble", "Rwanda Franc", "Euro", "Saint Helena Pound", "East Caribbean Dollar", "East Caribbean Dollar", "Euro", "Euro", "East Caribbean Dollar", "Tala", "Euro", "Dobra", "Saudi Riyal", "CFA Franc BCEAO", "Serbian Dinar", "Seychelles Rupee", "Leone", "Singapore Dollar", "Netherlands Antillean Guilder", "Sucre", "Euro", "Euro", "Solomon Islands Dollar", "Somali Shilling", "Rand", "No universal currency", "South Sudanese Pound", "Euro", "Sri Lanka Rupee", "Sudanese Pound", "Surinam Dollar", "Norwegian Krone", "Lilangeni", "Swedish Krona", "Swiss Franc", "WIR Euro", "WIR Franc", "Syrian Pound", "New Taiwan Dollar", "Somoni", "Tanzanian Shilling", "Baht", "US Dollar", "CFA Franc BCEAO", "New Zealand Dollar", "Pa’anga", "Trinidad and Tobago Dollar", "Tunisian Dinar", "Turkish Lira", "Turkmenistan New Manat", "US Dollar", "Australian Dollar", "Uganda Shilling", "Hryvnia", "UAE Dirham", "Pound Sterling", "US Dollar", "US Dollar", "US Dollar (Next day)", "Peso Uruguayo", "Uruguay Peso en Unidades Indexadas (UI)", "Unidad Previsional", "Uzbekistan Sum", "Vatu", "Bolívar Soberano", "Dong", "US Dollar", "US Dollar", "CFP Franc", "Moroccan Dirham", "Yemeni Rial", "Zambian Kwacha", "Zimbabwe Dollar"]
      currency_code: ["AFN", "EUR", "ALL", "DZD", "USD", "EUR", "AOA", "XCD", "XCD", "ARS", "AMD", "AWG", "AUD", "EUR", "AZN", "BSD", "BHD", "BDT", "BBD", "BYN", "EUR", "BZD", "XOF", "BMD", "INR", "BTN", "BOB", "BOV", "USD", "BAM", "BWP", "NOK", "BRL", "USD", "BND", "BGN", "XOF", "BIF", "CVE", "KHR", "XAF", "CAD", "KYD", "XAF", "XAF", "CLP", "CLF", "CNY", "AUD", "AUD", "COP", "COU", "KMF", "CDF", "XAF", "NZD", "CRC", "XOF", "HRK", "CUP", "CUC", "ANG", "EUR", "CZK", "DKK", "DJF", "XCD", "DOP", "USD", "EGP", "SVC", "USD", "XAF", "ERN", "EUR", "ETB", "EUR", "FKP", "DKK", "FJD", "EUR", "EUR", "EUR", "XPF", "EUR", "XAF", "GMD", "GEL", "EUR", "GHS", "GIP", "EUR", "DKK", "XCD", "EUR", "USD", "GTQ", "GBP", "GNF", "XOF", "GYD", "HTG", "USD", "AUD", "EUR", "HNL", "HKD", "HUF", "ISK", "INR", "IDR", "XDR", "IRR", "IQD", "EUR", "GBP", "ILS", "EUR", "JMD", "JPY", "GBP", "JOD", "KZT", "KES", "AUD", "KPW", "KRW", "KWD", "KGS", "LAK", "EUR", "LBP", "LSL", "ZAR", "LRD", "LYD", "CHF", "EUR", "EUR", "MOP", "MKD", "MGA", "MWK", "MYR", "MVR", "XOF", "EUR", "USD", "EUR", "MRU", "MUR", "EUR", "XUA", "MXN", "MXV", "USD", "MDL", "EUR", "MNT", "EUR", "XCD", "MAD", "MZN", "MMK", "NAD", "ZAR", "AUD", "NPR", "EUR", "XPF", "NZD", "NIO", "XOF", "NGN", "NZD", "AUD", "USD", "NOK", "OMR", "PKR", "USD", "PAB", "USD", "PGK", "PYG", "PEN", "PHP", "NZD", "PLN", "EUR", "USD", "QAR", "EUR", "RON", "RUB", "RWF", "EUR", "SHP", "XCD", "XCD", "EUR", "EUR", "XCD", "WST", "EUR", "STN", "SAR", "XOF", "RSD", "SCR", "SLL", "SGD", "ANG", "XSU", "EUR", "EUR", "SBD", "SOS", "ZAR", "SSP", "EUR", "LKR", "SDG", "SRD", "NOK", "SZL", "SEK", "CHF", "CHE", "CHW", "SYP", "TWD", "TJS", "TZS", "THB", "USD", "XOF", "NZD", "TOP", "TTD", "TND", "TRY", "TMT", "USD", "AUD", "UGX", "UAH", "AED", "GBP", "USD", "USD", "USN", "UYU", "UYI", "UYW", "UZS", "VUV", "VES", "VND", "USD", "USD", "XPF", "MAD", "YER", "ZMW", "ZWL"]
--- a/src/main/resources/en/disease.yml
+++ b/src/main/resources/en/disease.yml
@ -1,12 +0,0 @@
-en:
-  faker:
-    disease:
-      internal_disease: ['Acidosis', 'Adams-Stokes syndrome', 'alcoholism', 'alkalosis', 'anaphylaxis', 'anemia', 'iron deficiency anemia', 'megaloblastic anemia', 'aplastic anemia', 'angiitis', 'angina pectoris', 'arteriosclerosis', 'apoplexy', 'auricular fibrillation', 'auriculo-ventricular block', 'bronchial asthma', 'bronchitis', 'bronchiectasis', 'bronchopneumonia', 'carcinoma', 'cardiac arrhythmia', 'cardiac failure', 'cardiomyopathy', 'cirrhosis', 'coronary arteriosclerotic heart disease', 'Crohn disease', "Cushing's syndrome", 'diabetes', 'diffuse intravascular coagulation', 'dysentery', 'enteritis', 'gastric ulcer', 'gastritis', 'gout', 'hepatitis', "Hodgkin's disease", 'hyperlipemia', 'hyperparathyroidism', 'hypersplenism', 'hypertension', 'hyperthyroidism', 'hypoglycemia', 'hypothyroidism', 'infective endocarditis', 'influenza', 'leukemia', 'lobar pneumonia', 'lymphadenitis', 'lymphoma', 'malaria', 'malnutrition', 'measles', 'myeloma', 'myocardial infarction', 'myocarditis', 'nephritis', 'nephritic syndrome', 'obstructive pulmonary emphysema', 'pancreatitis', 'peptic ulcer', 'peritonitis', 'pleuritis', 'pneumonia', 'pneumothorax', 'purpura', 'allergic purpura', 'thrombocytolytic purpura', 'pyelonephritis', 'renal failure', 'rheumatic fever', 'rheumatoid arthritis', 'scarlet fever', 'septicemia', 'syphilis', 'tachycardia', 'tumour', 'typhoid', 'ulcerative colitis']
-      neurology: ['brain abscess', 'cerebral embolism', 'cerebral infarction', 'cerebral thrombosis', 'cerebral hemorrhage', 'concussion of brain', 'craniocerebral injury', 'epilepsy', 'intracranial tumour', 'intracranial hematoma', 'meningitis', 'migraine', 'neurasthenia', 'neurosis', 'paranoid psychosis', "Parkinson's disease", 'psychosis']
-      surgery: ['abdominal external hernia', 'acute diffuse peritonitis', 'acute mastitis', 'acute pancreatitis', 'acute perforation of gastro-duodenal', 'acute pyelonephritis', 'anal fissure', 'anal fistula', 'anesthesia', 'angioma', 'appendicitis', 'bleeding of gastro-duodenal ulcer', 'bone tumour', 'breast adenoma', 'burn', 'cancer of breast', 'carbuncle', 'carcinoma of colon', 'carcinoma of esophagus', 'carcinoma of gallbladder', 'carcinoma of rectum', 'carcinoma of stomach', 'cholecystitis', 'cervical spondylosis', 'choledochitis', 'cholelithiasis', 'chondroma', 'dislocation of joint', 'erysipelas', 'fracture', 'furuncle', 'hemorrhoid', 'hemothorax', 'hypertrophy of prostate', 'intestinal obstruction', 'intestinal tuberculosis', 'lipoma', 'lithangiuria', 'liver abscess', 'melanoma', 'osseous tuberculosis', 'osteoclastoma', 'osteoporosis', 'osteosarcoma', 'osteosarcoma', "Paget's disease", 'perianorecrtal abscess', 'phlegmon', 'portal hypertension', 'prostatitis', 'protrusion of intervertebral disc', 'purulent arthritis', 'pyogenic ostcomyclitis', 'pyothorax', 'rectal polyp', 'rheumatoid arthritis', 'rupture of spleen', 'scapulohumeral periarthritis', 'tenosynovitis', 'tetanus', 'thromboangiitis', 'thyroid adenocarcinoma', 'thyroid adenoma', 'trauma', 'urinary infection', 'varicose vein of lower limb']
-      paediatrics: ['acute military tuberculosis of the lung', 'acute necrotic enteritis', 'anaphylactic purpura', 'ancylostomiasis', 'ascariasis', 'asphyxia of the newborn', 'atrial septal defect', 'birth injury', 'cephalhematoma', 'cerebral palsy', 'congenital torticollis', 'convulsion', "Down's syndrome", 'glomerulonephritis', 'hemophilia', 'infantile diarrhea', 'intracranial hemorrhage of the newborn', 'intussusception', 'necrotic enterocolitis of newborn', 'neonatal jaundice', 'nutritional iron deficiency anemia', 'nutritional megaloblastic anemia', 'patent ductus arteriosis', 'poliomyelitis', 'premature infant', 'primary tuberculosis', 'progressive muscular dystrophy', 'pulmonary stenosis', 'purulent meningitis', 'rickets', 'sepsis of the newborn', 'tetanus of the newborn', 'tetralogy of Fallot', 'thrush', 'varicella', 'ventricular septal defect', 'viral encephalitis', 'viral myocarditis']
-      gynecology_and_obstetrics: ['abortion', 'adenomyosis', 'amniotic fluid embolism', 'Bartholins cyst', 'carcinoma of cervix', 'carcinoma of endometrium', 'carcinoma of ovary', 'cervicitis', 'chorio-epithelioma', 'corpora luteum cyst', 'dystocia', 'eclampsia', 'edema-proteinuria-hypertension', 'endometriosis', 'extrauterine pregnancy', 'hydatidiform mole', 'hyperemesis gravidarum', 'infertility', 'irregular menstruation', 'lochia', 'monilial vaginitis', 'multiple pregnancy', 'myoma of uterus', 'oligohydramnios', 'ovarian tumour', 'pelvic inflammatory disease', 'placenta previa', 'placental abruption', 'pregnancy-hypertension syndrome', 'premature birth', 'premature rupture of membrane', 'postpartum hemorrhage', 'puerperal infection', 'rupture of uterus', 'trichomonas vaginitis', 'uteroplacental apoplexy', 'vulvitis']
-      ophthalmology_and_otorhinolaryngology: ['amblyopia', 'tonsillitis', 'astigmatism', 'carcinoma of nasphyarynx', 'carcinoma of larynx', 'cataract', 'tinnitus', 'chalazion', 'colour blindness', 'deflection of nasal septum', 'deafness', 'furuncle of nasalvestibule', 'glaucoma', 'heterotropia', 'hyperopia', 'injury of cornea', 'ceruminal impaction', 'iritis', 'keratitis', 'labyrinthitis', 'laryngitis', 'mastoiditis', 'myopia', 'nasal sinusitis', 'otitis media', 'obstruction of larynx', 'peritonsillar abscess', 'pharyngitis', 'rhinitis']
-      dermatolory: ['acne', 'carcinoma of skin', 'bed sore', 'decubitus ulcer', 'drug eruption', 'eczema', 'herpes simplex', 'herpes zoster', 'lupus erythematosis', 'psoriasis', 'urticaria']
-
-
--- a/src/main/resources/en/elder_scrolls.yml
+++ b/src/main/resources/en/elder_scrolls.yml
@ -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."]
--- a/src/main/resources/en/englandfootball.yml
+++ b/src/main/resources/en/englandfootball.yml
@ -1,103 +0,0 @@
-en:
-  faker:
-    englandfootball:
-      leagues: [
-        "PremierLeague",
-        "EFLChampionship",
-        "EFLLeagueone",
-        "EFLLeaguetwo"
-      ]
-      teams: [
-        "NewcastileUnited",
-        "LecesterCityF.C.",
-        "LiverpoolF.C.",
-        "LeedsUnitedF.C.",
-        "ManchesterCityF.C.",
-        "ManchesterUnitedF.C.",
-        "BurnleyF.C.",
-        "Brighton&HoveAlbionF.C.",
-        "SouthamptonF.C.",
-        "SheffieldUnitedF.C.",
-        "ArsenalF.C.",
-        "AstonVillaF.C.",
-        "EvertonF.C.",
-        "WolverhamptonWanderersF.C.",
-        "WestBromwichAlbionF.C.",
-        "WestHamUnitedF.C.",
-        "ChelseaF.C.",
-        "TottenhamHotspurF.C.",
-        "CrystalPalaceF.C.",
-        "FulhamF.C.",
-        "NorwichCityF.C.",
-        "NottinghamForestF.C.",
-        "DerbyCountyF.C.",
-        "RotherhamUnitedF.C.",
-        "LutonTownF.C.",
-        "ReadingF.C.",
-        "MiddlesbroughF.C.",
-        "MillwallF.C.",
-        "BarnsleyF.C.",
-        "BirminghamCity.F.C.",
-        "A.F.C.Bournemouth",
-        "BrentfordF.C.",
-        "BristolCityF.C.",
-        "BlackburnRoversF.C.",
-        "SheffieldWednesdayF.C.",
-        "SwanseaCityA.F.C.",
-        "StokeCityF.C.",
-        "WatfordF.C.",
-        "WycombeWanderersF.C.",
-        "CardiffCityF.C.",
-        "CoventryCity.F.C.",
-        "QueensParkRangersF.C.",
-        "PrestonNorthEndF.C.",
-        "HuddersfieldTownA.F.C.",
-        "NorthamptonTownF.C.",
-        "DoncasterRoversF.C.",
-        "RochdaleA.F.C.",
-        "LincolnCityF.C.",
-        "MiltonKeynesDonsF.C.",
-        "BurtonAlbionF.C.",
-        "BristolRoversF.C.",
-        "BlackpoolF.C.",
-        "SunderlandA.F.C.",
-        "ShrewsburyTownF.C.",
-        "SwindonTownF.C.",
-        "AccringtonStanleyF.C.",
-        "OxforUnitedF.C.",
-        "WiganAthleticF.C.",
-        "AFCWimbledon",
-        "IpswichTownF.C.",
-        "GillinghamF.C.",
-        "CharltonAthleticF.C.",
-        "CreweAlexandraF.C.",
-        "PortsmouthF.C.",
-        "PlymouthArgyleF.C.",
-        "FleetwoodTownF.C.",
-        "PeterboroughUnitedF.C.",
-        "HullCityA.F.C",
-        "GrimsbyTownF.C.",
-        "NewportCountyA.F.C.",
-        "LeytonOrientF.C.",
-        "MansfieldTownF.C.",
-        "MorecambeF.C.",
-        "BarrowA.F.C.",
-        "BoltonWanderersF.C.",
-        "BradfordCityA.F.C.",
-        "SouthendUnitedF.C.",
-        "SalfordCityF.C.",
-        "ScunthorpeUnitedF.C.",
-        "StevenageF.C.",
-        "ExeterCityF.C.",
-        "OldhamAthleticA.F.C.",
-        "WalsallF.C.",
-        "CheltenhamTownF.C.",
-        "CarlisleUnitedF.C.",
-        "CambridgeUnitedF.C.",
-        "ColchesterUnitedF.C.",
-        "CrawleyTownF.C.",
-        "TranmereRoversF.C.",
-        "ForestGreenRoversF.C.",
-        "PortValeF.C.",
-        "HarrogateTownA.F.C."
-      ]
--- a/src/main/resources/en/gender.yml
+++ b/src/main/resources/en/gender.yml
@ -1,6 +1,5 @@
-en:
-  faker:
-    gender:
-      types: ["Female", "Male", "NonBinary", "Agender", "Genderfluid", "Genderqueer", "Bigender", "Polygender"]
-      binary_types: ["Female", "Male"]
-      short_binary_types: ["f", "m"]
+en:
+  faker:
+    gender:
+      types: ["Female", "Male", "Non-binary", "Agender", "Genderfluid", "Genderqueer", "Bigender", "Polygender"]
+      binary_types: ["Female", "Male"]
--- a/src/main/resources/en/kaamelott.yml
+++ b/src/main/resources/en/kaamelott.yml
@ -1,5 +0,0 @@
-en:
-  faker:
-    kaamelott:
-      characters: ["Angharad", "Anna", "Appius Manilius", "Arthur", "Attila", "Belt", "Père Blaise", "Bohort", "Breccan", "Le roi burgonde", "Caius Camillus", "Calogrenant", "Capito", "César", "Cryda de Tintagel", "Dagonet", "La Dame du Lac", "Demetra", "Le duc d'Aquitaine", "Edern", "Élias de Kelliwic'h", "Galessin", "Gauvain", "Goustan", "Grüdü", "Guenièvre", "Guethenoc", "Hervé de Rinel", "L'interprète burgonde", "Le Seigneur Jacca", "Les Jumelles du pêcheur", "Le Jurisconsulte", "Kadoc", "Karadoc", "Lancelot", "Léodagan", "Loth", "Le maître d'armes", "Méléagant", "Manius Macrinus Firmus", "Merlin", "Mevanwi", "Perceval", "Le Répurgateur", "Roparzh", "Lucius Sillius Sallustius", "Séfriane d'Aquitaine", "Séli", "Spurius Cordius Frontinius", "Le tavernier", "Urgan", "Vérinus", "Venec", "Ygerne", "Yvain"]
-      quotes: ["Nous sommes jeunes, nous marchons à pieds... J'opterai donc pour un surnom en rapport : les Petits Pédestres.", "Sur une échelle de 2 à 76, et là je préfère prendre large, de 2 à 71 on ne nous écoute pas, de 72 à 75, on nous écoute toujours pas, et seulement à 76 on nous laisse parler sans nous engueuler.", "Sinon c'est les relances : doublette ; jeu carré ; jeu de piste ; jeu gagnant ; jeu moulin ; jeu-jeu ; joue-jeu ; joue-joue ; joue-jié ; joue-ganou ; gagnar ; catakt ; tacat ; cacatac ; cagat-cata et ratacat-mic. Ou : chante Sloubi. Nous, on va faire que chante Sloubi.", "Elle est où la poulette ?", "Sloubi 1, sloubi 2, sloubi 3, sloubi 4, sloubi 5 [...] sloubi 324, sloubi 325 !", "Arthur ! Kaamelott, c'est zéro ! Des cailloux, des cailloux, des cailloux, ça m'énerve !", "Arthour ! Couhillère !", "Ça y est... je vois trouble. C'est le manque de gras, je me dessèche.", "Comment vous dire... C'est systématiquement débile mais c'est toujours inattendu.", "Du passé faisons table en marbre.", "Les chiffres, c'est pas une science exacte figurez-vous !", "Sire, Sire ! On en a gros !", "Et toc ! Remonte ton slibard, Lothard !", "13, 14, 15... Enfin tous les chiffres impairs jusqu'à 22.", "Misa brevis et spiritus maxima. Ça veut rien dire, mais je suis très en colère contre moi même.", "C'est pas faux.", "JE NE MANGE PAS DE GRAINES !", "Qu'est-ce qui est petit et marron ?", "Et si je vous dis que vous êtes deux glands, là, vous avez du péremptoire. C'est vous qui voyez.", "Donc, pour résumer, je suis souvent victime des colibris, sous-entendu des types qu'oublient toujours tout", "Vous nous utilisez bon gré malgré pour arriver sur la fin.", "Lorsqu'on le tient par la partie sporadique, ou boulière, le fenouil est un objet redondant.", "Tout à l'heure, on a vu que le chapelet de saucisses n'était pas un objet redondant. Et pourtant, on a pu lui trouver une utilisation périmétrique en s'en servant comme un fouet.", "A chaque fois que vous parlez de lui, à partir de maintenant, dans les écritures, vous l’appellerez... Coco l’Asticot.", "Hé bah allez, une journée d'plus en moins. On va aller dormir et pi demain on recommence. Je peux vous dire que tavernier, c'est pas une sinécure.", "La prochaine fois que vous faites venir un barde, je lui ouvre le bide de là à là, j'lui sors les boyaux et je file sa langue à bouffer aux chiens. C'est clair, ça ?", "La patience est un plat qui se mange sans sauce."]
--- a/src/main/resources/en/mountain.yml
+++ b/src/main/resources/en/mountain.yml
@ -1,77 +0,0 @@
-en:
-  faker:
-    mountain:
-      range: [
-          "Himalayas",
-          "Karakoram",
-          "Hindu Kush",
-          "Pamirs",
-          "Hengduan Mountains",
-          "Tian Shan",
-          "Kunlun",
-          "Transhimalaya",
-          "Andes",
-          "Hindu Raj",
-          "Alaska Range",
-          "Saint Elias Mountains",
-          "Caucasus Mountains"
-      ]
-      name: [
-          "Everest",
-          "Cerro Aconcagua",
-          "Denali",
-          "Kilimanjaro",
-          "Elbrus",
-          "Vinson Massif",
-          "Puncak Jaya",
-          "K2",
-          "Kangchenjunga",
-          "Lhotse",
-          "Makalu",
-          "Mount Logan",
-          "Pico de Orizaba",
-          "Mount Saint Elias",
-          "Popocatépetl",
-          "Mount Foraker",
-          "Mount Lucania",
-          "Iztaccíhuatl",
-          "King Peak",
-          "Mount Bona",
-          "Cristobal Colon",
-          "Citlaltepetl",
-          "Mount Blanc",
-          "Damavand",
-          "Klyuchevskaya",
-          "Nanga Parbat",
-          "Mauna Kea",
-          "Jengish Chokusu (Pik Pobeda)",
-          "Chimborazo",
-          "Bogda Shan",
-          "Namcha Barwa",
-          "Kinabalu",
-          "Mount Rainier",
-          "Ras Dashen",
-          "Tajumulco",
-          "Pico Bolivar",
-          "Mount Fairweather",
-          "Margherita",
-          "Kangchenjunga",
-          "Tirich Mir",
-          "Koryaksky",
-          "Gunung Agung",
-          "Popocatepetl",
-          "Mount Whitney",
-          "Haleakala",
-          "Shiveluch",
-          "Nanda Devi",
-          "Mount Waddington",
-          "Mount Marcus Baker",
-          "Manaslu",
-          "Ojos del Salado",
-          "Monte San Valentin",
-          "Mount Fuji",
-          "Mount Kenya",
-          "Mount Ararat",
-          "Dhaulagiri I",
-          "Etna"
-      ]
--- a/src/main/resources/en/name.yml
+++ b/src/main/resources/en/name.yml
@ -27,4 +27,3 @@ en:
        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+]
--- a/src/main/resources/en/photography.yml
+++ b/src/main/resources/en/photography.yml
@ -1,31 +0,0 @@
-en:
- faker:
-    photography:
-      term: ["aperture", "exposure", "focal length", "film", "flash", "mirror", "reflection", "viewfinder", "hotshoe", "shutter", "lens", "35mm", "grain", "bokeh", "focus", "aberration", "b/w", "ISO", "DOF", "SLR", "DSLR", "Low key", "High key", "HDR"]
-      brand: ["Agfa", "Fujifilm", "Petnax", "Canon", "Casio", "Nikon", "Hama", "Olympus", "Sony", "Konica", "Minolta", "Konica Minolta", "Lumix", "Praktika", "Polaroid", "Panasonic", "Samsung", "Ricoh", "Tamron", "Sigma", "Arsenal", "BelOMO", "KMZ", "Leica", "LOMO", "FED", "Kodak", "Hasselblad", "llford", "Exacta", "Carl Zeiss", "Tokina", "Kenko", "Goerz", "Yashica", "Soligor GmbH", "VOMZ", "LOGP"]
-      camera: ["FED 1","FED 2","FED 3","FED 4","FED 5","KMZ Moskva-1","KMZ Moskva-2","KMZ Moskva-2A","KMZ Moskva-3","KMZ Moskva-4","KMZ Moskva-5", "KMZ Iskra", "KMZ Iskra-2", "Zorki", "Zorki-2", "Zorki-3", "Zorki-4", "Zorki-10","Zorki-11","Zorki-12","Zorki-15","Zorki-16", "MIR",
-               "Zenit-200A",  "Zenit-200AF",  "Zenit-200AF-U",  "Zenit-200-2AF",  "Zenit-200-Zoom",  "Zenit-compact",  "Zenit-104",  "Zenit-501P",  "Zenit-502P",  "Zenit-503H",  "Zenit-504G",  "Zenit-510",  "Zenit-520",  "Zenit-610",  "Zenit-620",  "Zenit-630",
-               "ZENIT-APS", "ZENIT-96", "ZENIT-E", "ZENIT-E2", "ZENIT-U", "ZENIT-V", "ZENIT-EM", "ZENIT-EM2", "ZENIT-VM", "ZENIT-T1", "ZENIT-ET", "ZENIT-VE", "ZENIT-10", "ZENIT-11", "ZENIT-50", "ZENIT-M", "ZENIT-2",
-               "Zenit-DM3","Zenit-DM5", "ZENIT-Z1",
-               "Moment-20","Moment-20U",  "ZENIT-70",  "Foton",  "Foton-2",  "Foton-3",  "Foton-M",  "Foton-E",  "Foton-PAK",  "Foton-automat",  "Foton-UFM (Moskva-UFM)",  "Foton-5",  "Foton-23",  "Foton-super",  "Panorama",
-               "Horizon-202-1", "Horizon-202-S", "Horizon-kompakt", "Horizon-S3", "Horizon-203", "PanArt-S3", "Horizon-203-U500",  "Horizon-S3-sport",  "Horizon-perfekt",  "Horizon-205",
-               "Start",  "Start-2", "Start-3",  "ZENIT-7", "ZENIT-D", "ZENIT-8", "ZENIT-9", "ZENIT-20", "ZENIT-21", "ZENIT-MK", "ZENIT-22", "ZENIT-23", "ZENIT-MTL", "ZENIT-7000",
-               "Photosniper", "Photosniper FS-3", "Photosniper FS-4", "Photosniper FS-4M", "Photosniper FS-5", "Photosniper FS-12", "Photosniper FS-14", "Photosniper FS-122",
-               "Smena","Smena 2","Smena 3","Smena 4","Smena 6","Smena 8","Smena 11","Smena 12","Smena 7","Smena 9",
-               "Kiev 2","Kiev 3","Kiev 4","Kiev 5","Kiev 6","Kiev 10","Kiev 15","Kiev 17","Kiev 20","Kiev 88","Kiev 90","Salyut S","Mirage 19M",
-               "LOMO-130A","LOMO-135M","LOMO-Compact", "Almaz 104", "Almaz 101",
-               "Canon EOS 1000D", "Canon EOS 1100D", "Canon EOS 1300D", "Canon EOS 2000D", "Canon EOS 4000D", "Canon EOS 300D", "Canon EOS 350D", "Canon EOS 400D", "Canon EOS 450D", "Canon EOS 500D", "Canon EOS 550D", "Canon EOS 600D", "Canon EOS 650D", "Canon EOS 700D", "Canon EOS 750D", "Canon EOS 760D", "Canon EOS 800D", "Canon EOS 10D", "Canon EOS 20D", "Canon EOS 30D", "Canon EOS 40D", "Canon EOS 50D", "Canon EOS 60D", "Canon EOS 70D", "Canon EOS 77D", "Canon EOS 80D", "Canon EOS 90D", "Canon EOS-1D", "Canon EOS-1D Mark II", "Canon EOS-1D Mark III", "Canon EOS-1D Mark IV", "Canon EOS-1Ds", "Canon EOS-1D X", "Canon EOS-1Ds", "Canon EOS-1Ds Mark II", "Canon EOS-1Ds Mark III", "Canon EOS 5D", "Canon EOS 5D Mark II", "Canon EOS 5D Mark III", "Canon EOS 5D Mark IV", "Canon EOS 5DS", "Canon EOS 6D", "Canon EOS 7D", "Canon EOS 7D Mark II", "Canon EOS M", "Canon EOS M2", "Canon EOS M3", "Canon EOS M5", "Canon EOS M6", "Canon EOS M50", "Canon EOS M100", "Canon PowerShot", "Canon PowerShot G", "Canon IXUS",
-               "Canon 7",  "Canon II",  "Canon P",  "Canon VT",  "Canonet",  "Canonet G-III QL17",   "Canon EOS R", "Canon EOS RP", "Canon EOS C200", "Canon EOS C300",  "Canon EOS C500",  "Canon EOS C100",  "Canon EOS C300 Mark II",  "Canon A-1",  "Canon AE-1",  "Canon AE-1 Program",  "Canon AL-1",  "Canon AT-1",  "Canon AV-1",  "Canon F-1",  "Canon New F-1",  "Canon FTb",  "Canon TLb",  "Canon TX",  "Canon T50",  "Canon T60",  "Canon T70",  "Canon T80",  "Canon T90",  "Canon FP",  "Canon FT QL",  "Canon FX",  "Canon Pellix",  "Canon Canonflex",  "Canon ELPH 490Z",
-               "Nikon D1", "Nikon D1H", "Nikon D1X", "Nikon D2H", "Nikon D2Hs", "Nikon D2X", "Nikon D2Xs", "Nikon D3", "Nikon D3S", "Nikon D3X", "Nikon D4", "Nikon D4S", "Nikon D5", "Nikon D40", "Nikon D40x", "Nikon D50",  "Nikon D60", "Nikon D70", "Nikon D70s", "Nikon D80", "Nikon D90", "Nikon D100", "Nikon D200", "Nikon D300", "Nikon D300S", "Nikon D500", "Nikon D600",  "Nikon D610", "Nikon D700", "Nikon D750", "Nikon D800", "Nikon D800E", "Nikon D810", "Nikon D810A", "Nikon D850", "Nikon D3000", "Nikon D3100", "Nikon D3200", "Nikon D3300", "Nikon D3400", "Nikon D3500", "Nikon D5000", "Nikon D5100", "Nikon D5200", "Nikon D5300", "Nikon D5500", "Nikon D5600", "Nikon D7000", "Nikon D7100", "Nikon D7200", "Nikon D7500", "Nikon E2", "Nikon E2N", "Nikon E2NS", "Nikon E2S", "Nikon E3", "Nikon E3s",
-               "Nikon F3AF", "Nikon F4", "Nikonos RS", "Nikon F5", "Nikon F6", "Nikon F-501", "Nikon F-801", "Nikon F-801S", "Nikon F90", "Nikon F90X", "Nikon F80", "Nikon F100", "Nikon F-601", "Nikon F70", "Nikon F75", "Nikon F-401", "Nikon F-401S", "Nikon F-401X", "Nikon F50", "Nikon F60", "Nikon F65", "Nikon F55", "Nikon I","Nikon M","Nikon S","Nikon S2","Nikon SP","Nikon S3","Nikon S4","Nikon S3M","Nikon S3","Nikon SP",
-               "Leica S", "Leica S-E", "Leica S2","Leica II",
-               "Pentax 645D", "Pentax 645Z","Pentax *ist D","Pentax *ist DL","Pentax *ist DL2","Pentax *ist DS","Pentax *ist DS2", "Pentax K-1","Pentax K-3","Pentax K-3 II","Pentax K-5","Pentax K-5 II","Pentax K-30","Pentax K-50","Pentax K-70", "Pentax K-r","Pentax K-S1","Pentax K-S2","Pentax K-x","Pentax K-7","Pentax K10D","Pentax K20D","Pentax K100D","Pentax K100D Super",  "Pentax K110D","Pentax K200D","Pentax K2000","Pentax KP","Pentax MZ-D",
-               "Olympus E-1", "Olympus E-3", "Olympus E-5", "Olympus E-10", "Olympus E-20", "Olympus E-30", "Olympus E-300", "Olympus E-330", "Olympus E-400", "Olympus E-410", "Olympus E-420", "Olympus E-450", "Olympus E-500", "Olympus E-510", "Olympus E-520", "Olympus E-620",
-               "Fujix DS-560", "Fujix DS-565", "FinePix IS Pro", "FinePix S1 Pro", "FinePix S2 Pro", "FinePix S3 Pro", "FinePix S3 Pro UVIR", "FinePix S5 Pro",
-               "Sony Alpha 100", "Sony Alpha 200", "Sony Alpha 230", "Sony Alpha 290", "Sony Alpha 300", "Sony Alpha 330", "Sony Alpha 350", "Sony α390",      "Sony Alpha 500", "Sony Alpha 550", "Sony Alpha 580", "Sony Alpha 700", "Sony Alpha 850", "Sony Alpha 900", "Sony DSLR-A100", "Sony DSLR-A100/B", "Sony DSLR-A100/S", "Sony DSLR-A200", "Sony DSLR-A230", "Sony DSLR-A290", "Sony DSLR-A300", "Sony DSLR-A300/N", "Sony DSLR-A330", "Sony DSLR-A330/T", "Sony DSLR-A350", "Sony DSLR-A350/N", "Sony DSLR-A380", "Sony DSLR-A390", "Sony DSLR-A450", "Sony DSLR-A500", "Sony DSLR-A550", "Sony DSLR-A560", "Sony DSLR-A580", "Sony DSLR-A700", "Sony DSLR-A850", "Sony DSLR-A900"]
-      lens: ["500mm/8", "17mm/2.0", "35mm/1.8", "50mm/1.2", "50mm/1.4", "50mm/1.8", "17-85mm/4.0-8.0", "85mm/1.2", "40mm/2.8", "70–300mm/4.5–5.6", "300mm/2.8", "35-350mm/3.5-5.6", "75-300mm/4-5.6", "24mm/1.4", "17–40mm/4", "24–105mm/4", "70–200mm/2.8", "70–200mm/4", "200-400mm/4", "85mm/1.8", "135mm/4", "600mm/4", "800mm/5.6", "18–55mm/3.5–5.6", "55–250mm/4–5.6", "10-24mm/3.5-4.5", "12-24mm/4", "16-85mm/3.5-5.6", "17-55mm/2.8", "18-55mm/3.5-5.6", "18-70mm/3.5-4.5", "18-105mm/3.5-5.6", "18-140mm/3.5-5.6", "18-200mm/3.5-5.6", "18-300mm/3.5-5.6", "18-300mm/3.5-6.3", "55-200mm/4-5.6", "fisheye", "tele", "wide-angle"]
-      genre: ["Abstract", "Portrait", "Landscape", "Techno", "Transportation", "Aviation", "Trains", "Ships", "Automobiles", "Bikes", "Army", "Navy", "Flora", "Fauna", "Sports", "Street", "City", "Village", "Country side", "Architecture", "Interior", "Food", "Wedding", "Stock", "Paparazzi", "Social", "Fashion", "Beauty", "Nude", "Science", "Space", "Aerial", "Industrial", "Artistic", "Underwater", "Night", "Low key", "High key", "Lomo", "Panoramic", "Macro", "Micro", "nano"]
-      imagetag: ["B/W", "wall", "sky", "clouds", "grass", "wood", "street", "city", "techno", "cars", "planes", "people", "tea", "coffee", "restaurant", "forest", "meadow", "mountain", "water", "river", "sunny", "cloudy", "rainy", "rain", "wave", "drop", "girl", "brick", "ocean", "sea", "river", "spring", "festival", "celebration", "show", "dances", "universe", "stars", "galaxy", "MIR", "ISS", "rocket", "jet", "fighter", "singer", "action", "show", "theater", "performance"]
-      aperture: ["f/0.5", "f/0.65", "f/0.7", "f/0.75", "f/0.85", "f/0.87", "f/0.95", "f/1.0", "f/1.2", "f/1.4", "f/1.8", "f/2.0", "f/2.8", "f/3.2", "f/4.0", "f/4.5", "f/5.0", "f/5.6", "f/6.3", "f/7.1", "f/8.0", "f/9.0", "f/10", "f/11", "f/13", "f/14", "f/16", "f/18", "f/20", "f/22", "f/25", "f/29", "f/32", "f/45", "f/64"]
-      shutter: ["32000", "16000", "8000", "6400", "5000", "4000", "3200", "2500", "2000", "1600", "1250", "1000", "800", "640", "500", "400", "320", "250", "200", "160", "125", "100", "80", "60", "50", "40", "1/30", "1/25", "1/20", "1/15", "1/13", "1/10", "1/8", "1/6", "1/5", "1/4", "1/2", "1", "2", "4", "8", "15", "30"]
-      iso: ["50", "64", "100", "125", "160", "200", "250", "320", "400", "500", "640", "800", "1000", "1250", "1600", "2000", "2500", "3200", "4000", "5000", "6400", "8000", "10000", "12800", "16000", "20000", "25600", "52200", "104400"]
--- a/src/main/resources/en/sip.yml
+++ b/src/main/resources/en/sip.yml
@ -1,101 +0,0 @@
---
-en:
-  faker:
-    sip:
-      methods: ["INVITE", "ACK", "BYE", "CANCEL", "REGISTER", "OPTIONS", "PRACK", "SUBSCRIBE", "NOTIFY", "PUBLISH", "INFO", "REFER", "MESSAGE", "UPDATE"]
-      content:
-        types: [
-          "application/sdp",
-          "application/resource-lists",
-          "application/pkcs7-mime",
-          "application/pkcs7-signature",
-          "application/x-private",
-          "application/xml",
-          "multipart/mixed",
-          "multipart/alternative",
-          "multipart/related",
-          "text/html"]
-      response:
-        codes:
-          provisional: ["100", "180", "181", "182", "183", "199"]
-          success: ["200", "202"]
-          redirection: ["300", "301", "302", "305", "380"]
-          clientError: [
-            "400",
-            "401",
-            "402",
-            "403",
-            "404",
-            "405",
-            "406",
-            "407",
-            "408",
-            "409",
-            "410",
-            "413",
-            "414",
-            "415",
-            "416",
-            "420",
-            "421",
-            "422",
-            "423",
-            "480",
-            "481",
-            "482",
-            "483",
-            "484",
-            "485",
-            "486",
-            "487",
-            "488",
-            "491",
-            "493"]
-          serverError: ["500", "501", "502", "503", "504", "505", "513", "555", "580"]
-          globalError: ["600", "603", "604", "606", "607"]
-        phrases:
-          provisional: ["Trying", "Ringing", "Call Is Being Forwarded", "Queued", "Session Progress", "Early Dialog Terminated"]
-          success: ["OK", "accepted"]
-          redirection: ["Multiple Choices", "Moved Permanently", "Moved Temporarily", "Use Proxy", "Alternative Service"]
-          clientError: [
-            "Bad Request",
-            "Unauthorized",
-            "Payment Required",
-            "Forbidden",
-            "Not Found",
-            "Method Not Allowed",
-            "Not Acceptable",
-            "Proxy Authentication Required",
-            "Request Timeout",
-            "Conflict",
-            "Gone",
-            "Request Entity Too Large",
-            "Request-URI Too Long",
-            "Unsupported Media Type",
-            "Unsupported URI Scheme",
-            "Bad Extension",
-            "Extension Required",
-            "Session Interval Too Small",
-            "Interval Too Brief",
-            "Temporarily Unavailable",
-            "Call/Transaction Does Not Exist",
-            "Loop Detected",
-            "Too Many Hops",
-            "Address Incomplete",
-            "Ambiguous",
-            "Busy Here",
-            "Request Terminated",
-            "Not Acceptable Here",
-            "Request Pending",
-            "Undecipherable"]
-          serverError: [
-            "Server Internal Error",
-            "Not Implemented",
-            "Bad Gateway",
-            "Service Unavailable",
-            "Server Time-out",
-            "Version Not Supported",
-            "Message Too Large",
-            "Push Notification Service Not Supported",
-            "Precondition Failure"]
-          globalError: ["Busy Everywhere", "Decline", "Does Not Exist Anywhere", "Not Acceptable", "Unwanted"]
--- a/src/main/resources/en/space.yml
+++ b/src/main/resources/en/space.yml
@ -11,7 +11,7 @@ en:
      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']
--- a/src/main/resources/en/star_trek.yml
+++ b/src/main/resources/en/star_trek.yml
@ -5,4 +5,3 @@ en:
      location: ["Qo'noS", "Romulus", "Bajor", "Vulcan", "Neutral Zone", "Alpha Quadrant", "Beta Quadrant", "Delta Quadrant", "Gamma Quadrant", "Tau Ceti Prime", "Wolf 359", "Thalos VII", "Cardassia", "Trillius Prime", "Badlands", "Betazed", "Risa", "Deep Space Nine", "Ferenginar", "The Briar Patch", "Khitomer"]
      specie: ["Breen", "El-Aurian", "Jem'Hadar", "Kazon", "Ocampa", "Q", "Ferengi", "Klingon", "Talaxian", "Vidiian", "Cardassian", "Vulcan", "Borg", "Romulan", "Vorta", "Andorian", "Bajoran", "Betazoid"]
      villain: ["Q", "Gorn", "Khan Noonien Singh", "Ru'afo", "Maltz", "Kruge", "Ayel", "Admiral Marcus", "Martia", "Lt. Valeris", "V'ger", "God of Sha Ka Ree", "Admiral Dougherty", "Nero", "Krall", "Tolian Soran", "Shinzon", "General Chang", "Lursa", "B'Etor", "Borg Queen"]
-      klingon: ["tlhIngan maH", "bogh tlhInganpu', SuvwI'pu' moj, Hegh", "SuvmeH 'ej charghmeH bogh tlhInganpu'", "DabuQlu'DI' yISuv", "qa' wIje'meH maSuv", "bI'IQchugh yIvang", "tIqIpqu' 'ej nom tIqIp", "lumbe' tlhInganpu'.", "Dubotchugh yIpummoH", "mataHmeH maSachnIS"]
--- a/src/main/resources/en/starcraft.yml
+++ b/src/main/resources/en/starcraft.yml
@ -1,352 +0,0 @@
-en:
-  faker:
-    starcraft:
-      units: [
-        "Archon",
-        "Carrier",
-        "Colossus",
-        "Dark Templar",
-        "High Templar",
-        "Immortal",
-        "Mothership",
-        "Observer",
-        "Phoenix",
-        "Probe",
-        "Sentry",
-        "Stalker",
-        "Void Ray",
-        "Warp Prism",
-        "Zealot",
-        "Oracle",
-        "Tempest",
-        "Mothership Core",
-        "Adept",
-        "Disruptor",
-        "Banshee",
-        "Battlecruiser",
-        "Ghost",
-        "Hellion",
-        "Marauder",
-        "Marine",
-        "Medivac Dropship",
-        "MULE",
-        "Raven",
-        "Reaper",
-        "SCV",
-        "Siege Tank",
-        "Thor",
-        "Viking",
-        "Auto-Turret",
-        "Point Defense Drone",
-        "Hellbat",
-        "Widow Mine",
-        "Liberator",
-        "Cyclone",
-        "Corruptor",
-        "Brood lord",
-        "Drone",
-        "Hydralisk",
-        "Infestor",
-        "Larva",
-        "Mutalisk",
-        "Overlord",
-        "Overseer",
-        "Queen",
-        "Roach",
-        "Ultralisk",
-        "Zergling",
-        "Baneling",
-        "Broodling",
-        "Changeling",
-        "Infested terran",
-        "Swarm Host",
-        "Viper",
-        "Lurker",
-        "Ravager"
-      ]
-      buildings: [
-        "Assimilator",
-        "Cybernetics Core",
-        "Dark Shrine",
-        "Fleet Beacon",
-        "Forge",
-        "Gateway",
-        "Nexus",
-        "Photon Cannon",
-        "Pylon",
-        "Robotics Facility",
-        "Robotics Bay",
-        "Shield Battery",
-        "Stargate",
-        "Templar Archives",
-        "Twilight Council",
-        "Warp Gate",
-        "Armory",
-        "Barracks",
-        "Bunker",
-        "Command Center",
-        "Orbital Command",
-        "Planetary Fortress",
-        "Engineering Bay",
-        "Factory",
-        "Fusion Core",
-        "Ghost Academy",
-        "Missile turret",
-        "Refinery",
-        "Sensor Tower",
-        "Starport",
-        "Supply Depot",
-        "Reactor",
-        "Tech Lab",
-        "Baneling Nest",
-        "Creep Tumor",
-        "Evolution Chamber",
-        "Extractor",
-        "Hatchery",
-        "Lair",
-        "Hive",
-        "Hydralisk Den",
-        "Infestation Pit",
-        "Nydus Network",
-        "Nydus Worm",
-        "Roach Warren",
-        "Spawning Pool",
-        "Spine Crawler",
-        "Spire",
-        "Greater Spire",
-        "Spore Crawler",
-        "Ultralisk Cavern",
-        "Lurker Den"
-      ]
-      characters: [
-        "Abathur",
-        "Alarak",
-        "Aldaris",
-        "Amon",
-        "Artanis",
-        "Daggoth",
-        "Carolina Davis",
-        "Dehaka",
-        "Gerard DuGalle",
-        "Edmund",
-        "Duke",
-        "Samir Duran",
-        "Emil Narud",
-        "Fenix",
-        "Tychus Findlay",
-        "Ariel Hanson",
-        "Matt Horner",
-        "Izsha",
-        "Karax",
-        "Sarah Kerrigan",
-        "Arcturus Mengsk",
-        "Valerian Mengsk",
-        "Overmind",
-        "Raszagal",
-        "Jim Raynor",
-        "Reigel",
-        "Rohana",
-        "Selendis",
-        "Egon Stetmann",
-        "Alexei Stukov",
-        "Rory Swann",
-        "Talandar",
-        "Tassadar",
-        "Nova Terra",
-        "Gabriel Tosh",
-        "Vorazun",
-        "Horace Warfield",
-        "Zagara",
-        "Zasz",
-        "Zeratul",
-        "Zurvan"
-      ]
-      planets: [
-        "Abaddon",
-        "Adena",
-        "Aeneas",
-        "Agria",
-        "Aiur",
-        "Alamar",
-        "Albion",
-        "Aleun",
-        "Alpha Draconis",
-        "Altara",
-        "Altheon",
-        "Anselm",
-        "Antiga Prime",
-        "Aridas",
-        "Artesia Prime",
-        "Artika",
-        "Ash'Arak",
-        "Ashrigo",
-        "Aspar",
-        "Asteria",
-        "Astrid III",
-        "Atrias",
-        "Atticus Minor",
-        "Avernus",
-        "Bel'Shir",
-        "Bellum IV",
-        "Beta Saul",
-        "Bhekar Ro",
-        "Boone",
-        "Borea",
-        "Bountiful",
-        "Braken",
-        "Braxis",
-        "Braxis Alpha",
-        "Brokas Hur",
-        "Brontes",
-        "Brontes IV",
-        "Bukari V",
-        "Calus",
-        "Candore",
-        "Cantar",
-        "Castanar",
-        "Cavir",
-        "Char",
-        "Chau Sara",
-        "Chiron",
-        "Planet Christmas",
-        "Cirion",
-        "Cruxas III",
-        "Dannuth VII",
-        "Dark planet",
-        "Dead Man's Rock",
-        "Demon's Fair",
-        "Dylar IV",
-        "Earth",
-        "Eldersthine",
-        "Exgelia IV",
-        "Feronis",
-        "Formicia",
-        "G-2275",
-        "Gamma Dorian",
-        "Gantris VI",
-        "Gantuan VI",
-        "Garrxax",
-        "Gelgaris",
-        "Glacius",
-        "Gohbus",
-        "Goldilocks",
-        "Great Bend",
-        "Grissom IV",
-        "Grnaki Prime",
-        "Gyras",
-        "Gystt",
-        "Halcyon",
-        "Haven",
-        "Heimdall IV",
-        "Helioc III",
-        "Helios",
-        "Hydrax",
-        "Icarus IV",
-        "Ignus",
-        "J'larre",
-        "Jarban Minor",
-        "Jontur II",
-        "Jotun",
-        "Ketill IV",
-        "Korhal",
-        "Krydon",
-        "Lakius",
-        "Lerilak Crest",
-        "Lorcadia",
-        "Luria IV",
-        "LV-555",
-        "Maltair IV",
-        "Mar Sara",
-        "Marek V",
-        "Marlowe",
-        "Mehlus IV",
-        "Meinhoff",
-        "Melkora",
-        "Midr IV",
-        "Miranar",
-        "Mistaff IV",
-        "Moria",
-        "Nelyth",
-        "Nemaka",
-        "Nephor II",
-        "New Folsom",
-        "New Sydney",
-        "New Trinidad",
-        "Nidhogg",
-        "Nidhogg III",
-        "Norris VI",
-        "Old Faithful",
-        "Onuru Sigma",
-        "Orna III",
-        "Paralta",
-        "Parragos",
-        "Pegasus",
-        "Phaeton",
-        "Pho-Rekh",
-        "Pike's Peak",
-        "Port Zion",
-        "Pridewater",
-        "Raydin III",
-        "Raydin IV",
-        "Redstone III",
-        "Revan II",
-        "Revera",
-        "Reynif II",
-        "Roxara",
-        "Saluset",
-        "Samiku",
-        "Sammy",
-        "Scoria",
-        "Seti",
-        "Shakuras",
-        "Shi",
-        "Shiloh",
-        "Sigmaris Prime",
-        "Sirocco",
-        "Slayn",
-        "Sonyan",
-        "Sorona",
-        "Sutur V",
-        "Swampus",
-        "Tal Qirat",
-        "Talvaria",
-        "TarKossia",
-        "Tarsonis",
-        "Tashai",
-        "Taurus IV",
-        "Tepperus",
-        "Thalon VII",
-        "Thanix III",
-        "Thys",
-        "Timul IV",
-        "Tiria",
-        "Torenis Prime",
-        "Torus",
-        "Turaxis II",
-        "Typhon XI",
-        "Tyrador VIII",
-        "Tyrador III",
-        "Tyrador IX",
-        "Uilel IV",
-        "Uilila IV",
-        "Ullalah II",
-        "Umoja",
-        "Urona Sigma",
-        "Van Osten's Moon",
-        "Vanass",
-        "Vardona",
-        "Veridia Prime",
-        "Vyctor 5",
-        "Vygoire",
-        "Warrant VI",
-        "Wotan II",
-        "Xil",
-        "XT39323",
-        "Ynoth",
-        "Zanadar Prime",
-        "Zenn",
-        "Zeph III",
-        "Zerus",
-        "Zhakul",
-        "Zz'gash"
-      ]
--- a/src/main/resources/es-MX.yml
+++ b/src/main/resources/es-MX.yml
@ -52,7 +52,7 @@ es-MX:

    name:
      first_name: [José Luis, Juan, Francisco, José, Antonio, Jesús, Miguel Ángel, Pedro, Alejandro, Manuel, Juan Carlos, Roberto, Jorge, Carlos, Fernando, Ricardo, Miguel, Javier, Martín, Rafael, Raúl, Arturo, Daniel, Eduardo, Enrique, Mario, José Antonio, Sergio, Gerardo, Salvador, Marco Antonio, Alfredo, David, Armando, Alberto, Luis, Óscar, Ramón, Guillermo, Rubén, Jaime, Felipe, Julio César, Andrés, Pablo, Ángel, Gabriel, Héctor, Alfonso, José Guadalupe, Agustín, Ignacio, Víctor, Rogelio, Gustavo, Ernesto, Rodolfo, Luis Alberto, Gilberto, Vicente, Juan Antonio, Tomás, Israel, César, Adrián, Ismael, Santiago, Humberto, Gregorio, Joel, Esteban, José Alfredo, Nicolás, Omar, Moisés, Félix, Lorenzo, Samuel, Carlos Alberto, José Angel, Ramiro, Abel, Jorge Luis, Marcos, Mario Alberto, Rodrigo, Edgar, Isidro, José Alberto, Leonardo, Benjamín, Jorge Alberto, Julio, Raymundo, Víctor Hugo, Saúl, Benito, José Juan, Rigoberto, Hugo,  Guadalupe, María, Margarita, Verónica, María Elena, Josefina, Leticia, Teresa, Patricia, Rosa, Martha, Rosa María, Alicia, Yolanda, Francisca, Silvia, Elizabeth, Gloria, Ana María, Gabriela, Alejandra, María Luisa, María de Lourdes, Adriana, Araceli, Antonia, Lucía, Carmen, Irma, Claudia, Beatriz, Isabel, Laura, Maribel, Graciela, Virginia, Catalina, Esperanza, Angélica, Maricela, Cecilia, Susana, Cristina, Julia, Concepción, Victoria, Ofelia, Rocío, Carolina, Raquel, Petra, Lorena, Reyna, Sandra, Paula, Guillermina, Sara, Elvira, Manuela, Marisol, Mónica, Erika, Celia, Luz María, Irene, Magdalena, Estela, Ángela, Rosario, Esther, Eva, Norma, Aurora, Socorro, Consuelo, Lidia, Bertha, Sofía, Dolores, Elena, Rosalba, Liliana, Andrea, Adela, Mariana, Fabiola, Karina, Martina, Marcela, Miriam, Mercedes, Marina, Amalia, Olivia, Angelina, Sonia, Agustina, Edith, Lilia, Micaela]
-      last_name: [Hernández, García, Martínez, López, González, Rodríguez, Pérez, Sánchez, Ramírez, Cruz, Flores, Gómez, Morales, Vázquez, Reyes, Jímenez, Torres, Díaz, Gutiérrez, Mendoza, Ruiz, Aguilar, Ortiz, Castillo, Moreno, Romero, Álvarez, Chávez, Rivera, Juárez, Ramos, Méndez, Domínguez, Herrera, Medina, Vargas, Castro, Guzmán, Velázquez, Muñoz, Rojas, Contreras, Salazar, Luna, de la Cruz, Ortega, Guerrero, Santiago, Estrada, Bautista, Cortés, Soto, Alvarado, Espinoza, Lara, Ávila, Ríos, Cervantes, Silva, Delgado, Vega, Márquez, Sandoval, Fernández, León, Carrillo, Mejía, Solís, Núñez, Rosas, Valdez, Ibarra, Campos, Santos, Camacho, Peña, Maldonado, Navarro, Rosales, Acosta, Miranda, Trejo, Cabrera, Valencia, Nava, Castañeda, Pacheco, Robles, Molina, Rangel, Fuentes, Huerta, Meza, Aguirre, Cárdenas, Orozco, Padilla, Espinosa, Ayala, Salas, Valenzuela, Zúñiga, Ochoa, Salinas, Mora, Tapia, Serrano, Durán, Olvera, Macías, Zamora, Calderón, Arellano, Suárez, Barrera, Zavala, Villegas, Gallegos, Lozano, Galván, Figueroa, Beltrán, Franco, Villanueva, Sosa, Montes, Andrade, Velasco, Arias, Marín, Corona, Garza, Ponce, Esquivel, Pineda, Alonso, Palacios, Antonio, Vásquez, Trujillo, Cortez, Rocha, Rubio, Bernal, Benítez, Escobar, Villa, Galindo, Cuevas, Bravo, Cano, Osorio, Mata, Carmona, Montoya, de Jesús, Enríquez, Cisneros, Rivas, Parra, Reséndiz, Téllez, Zárate, Salgado, de la Rosa, Vera, Tovar, Arroyo, Córdova, Leyva, Quintero, Becerra, Quiroz, Barajas, Ávalos, Peralta, Román, Esparza, Murillo, Guevara, Olivares, Félix, de León, Castellanos, Villarreal, Villalobos, Lugo, Ángeles, Montiel, Segura, Magaña, Saucedo, Gallardo, Mercado, Navarrete, Reyna, Paredes, Dávila, Leal, Guerra, Saldaña, Guillén, Santana, Uribe, Monroy, Piña, Yáñez, Nieto, Islas, Granados, Escobedo, Zapata, Caballero, del Ángel, Solano, Barron, Zepeda, Acevedo, Arriaga, Barrios, Mondragón, Galicia, Godínez, Ojeda, Duarte, Alfaro, Medrano, Rico, Aguilera, Gil, Ventura, Balderas, Arredondo, Coronado, Escamilla, Nájera, Palma, Amador, Blanco, Ocampo, Garduño, Barragán, Gámez, Francisco, Meléndez, Carbajal, Hurtado, Carrasco, Bonilla, Correa, Sierra, Anaya, Carranza, Romo, Valdés, Armenta, Alcántara, Escalante, Arreola, Quezada, Alarcón, Gaytán, Rentería, Vidal, Báez, de los Santos, Toledo, Colín, May, Carrera, Jaramillo, Santillán, Valle, Varela, Arenas, Rendón, Treviño, Venegas, Soriano, Zaragoza, Morán, Áviles, Aranda, Lira, Quintana, Arteaga, Valadez, Cordero, Sotelo, de la Torre, Muñiz, Hidalgo, Cázares, Covarrubias, Zamudio, Ordoñez, Aparicio, Baltazar, Gálvez, Madrigal,Ibañez,De Romaña,Ormeño]
+      last_name: [Hernández, García, Martínez, López, González, Rodríguez, Pérez, Sánchez, Ramírez, Cruz, Flores, Gómez, Morales, Vázquez, Reyes, Jímenez, Torres, Díaz, Gutiérrez, Mendoza, Ruiz, Aguilar, Ortiz, Castillo, Moreno, Romero, Álvarez, Chávez, Rivera, Juárez, Ramos, Méndez, Domínguez, Herrera, Medina, Vargas, Castro, Guzmán, Velázquez, Muñoz, Rojas, Contreras, Salazar, Luna, de la Cruz, Ortega, Guerrero, Santiago, Estrada, Bautista, Cortés, Soto, Alvarado, Espinoza, Lara, Ávila, Ríos, Cervantes, Silva, Delgado, Vega, Márquez, Sandoval, Fernández, León, Carrillo, Mejía, Solís, Núñez, Rosas, Valdez, Ibarra, Campos, Santos, Camacho, Peña, Maldonado, Navarro, Rosales, Acosta, Miranda, Trejo, Cabrera, Valencia, Nava, Castañeda, Pacheco, Robles, Molina, Rangel, Fuentes, Huerta, Meza, Aguirre, Cárdenas, Orozco, Padilla, Espinosa, Ayala, Salas, Valenzuela, Zúñiga, Ochoa, Salinas, Mora, Tapia, Serrano, Durán, Olvera, Macías, Zamora, Calderón, Arellano, Suárez, Barrera, Zavala, Villegas, Gallegos, Lozano, Galván, Figueroa, Beltrán, Franco, Villanueva, Sosa, Montes, Andrade, Velasco, Arias, Marín, Corona, Garza, Ponce, Esquivel, Pineda, Alonso, Palacios, Antonio, Vásquez, Trujillo, Cortez, Rocha, Rubio, Bernal, Benítez, Escobar, Villa, Galindo, Cuevas, Bravo, Cano, Osorio, Mata, Carmona, Montoya, de Jesús, Enríquez, Cisneros, Rivas, Parra, Reséndiz, Téllez, Zárate, Salgado, de la Rosa, Vera, Tovar, Arroyo, Córdova, Leyva, Quintero, Becerra, Quiroz, Barajas, Ávalos, Peralta, Román, Esparza, Murillo, Guevara, Olivares, Félix, de León, Castellanos, Villarreal, Villalobos, Lugo, Ángeles, Montiel, Segura, Magaña, Saucedo, Gallardo, Mercado, Navarrete, Reyna, Paredes, Dávila, Leal, Guerra, Saldaña, Guillén, Santana, Uribe, Monroy, Piña, Yáñez, Nieto, Islas, Granados, Escobedo, Zapata, Caballero, del Ángel, Solano, Barron, Zepeda, Acevedo, Arriaga, Barrios, Mondragón, Galicia, Godínez, Ojeda, Duarte, Alfaro, Medrano, Rico, Aguilera, Gil, Ventura, Balderas, Arredondo, Coronado, Escamilla, Nájera, Palma, Amador, Blanco, Ocampo, Garduño, Barragán, Gámez, Francisco, Meléndez, Carbajal, Hurtado, Carrasco, Bonilla, Correa, Sierra, Anaya, Carranza, Romo, Valdés, Armenta, Alcántara, Escalante, Arreola, Quezada, Alarcón, Gaytán, Rentería, Vidal, Báez, de los Santos, Toledo, Colín, May, Carrera, Jaramillo, Santillán, Valle, Varela, Arenas, Rendón, Treviño, Venegas, Soriano, Zaragoza, Morán, Áviles, Aranda, Lira, Quintana, Arteaga, Valadez, Cordero, Sotelo, de la Torre, Muñiz, Hidalgo, Cázares, Covarrubias, Zamudio, Ordoñez, Aparicio, Baltazar, Gálvez, Madrigal]
      prefix: [Sr., Sra., Srita., Dr., Ing.]
      suffix: [Jr., Sr., I, II, III, IV, V]
      title:
--- a/src/main/resources/es.yml
+++ b/src/main/resources/es.yml
--- a/src/main/resources/fr-CH.yml
+++ b/src/main/resources/fr-CH.yml
@ -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.####.######']
--- a/src/main/resources/fr.yml
+++ b/src/main/resources/fr.yml
@ -7,7 +7,7 @@ fr:
      secondary_address: ['Apt. ###', '# étage']
      postcode: ['#####']
      state: ['Alsace', 'Aquitaine', 'Auvergne', 'Basse-Normandie', 'Bourgogne', 'Bretagne', 'Centre', 'Champagne-Ardenne', 'Corse', 'Franche-Comté', 'Guadeloupe', 'Guyane', 'Haute-Normandie', 'Île-de-France', 'La Réunion', 'Languedoc-Roussillon', 'Limousin', 'Lorraine', 'Martinique', 'Mayotte', 'Midi-Pyrénées', 'Nord-Pas-de-Calais', 'Pays de la Loire', 'Picardie', 'Poitou-Charentes', "Provence-Alpes-Côte d'Azur", 'Rhône-Alpes']
-      city_name: ["Paris", "Marseille", "Lyon", "Toulouse", "Nice", "Nantes", "Strasbourg", "Montpellier", "Bordeaux", "Lille", "Rennes", "Reims", "Le Havre", "Saint-Étienne", "Toulon", "Grenoble", "Dijon", "Angers", "Saint-Denis", "Villeurbanne", "Le Mans", "Aix-en-Provence", "Brest", "Nîmes", "Limoges", "Clermont-Ferrand", "Tours", "Amiens", "Metz", "Perpignan", "Besançon", "Orléans", "Boulogne-Billancourt", "Mulhouse", "Rouen", "Caen", "Nancy", "Saint-Denis", "Saint-Paul", "Montreuil", "Argenteuil", "Roubaix", "Dunkerque", "Tourcoing", "Nanterre", "Avignon", "Créteil", "Poitiers", "Fort-de-France", "Courbevoie", "Versailles", "Vitry-sur-Seine", "Colombes", "Pau", "Aulnay-sous-Bois", "Asnières-sur-Seine", "Rueil-Malmaison", "Saint-Pierre", "Antibes", "Saint-Maur-des-Fossés", "Champigny-sur-Marne", "La Rochelle", "Aubervilliers", "Calais", "Cannes", "Le Tampon", "Béziers", "Colmar", "Bourges", "Drancy", "Mérignac", "Saint-Nazaire", "Valence", "Ajaccio", "Issy-les-Moulineaux", "Villeneuve-d'Ascq", "Levallois-Perret", "Noisy-le-Grand", "Quimper", "La Seyne-sur-Mer", "Antony", "Troyes", "Neuilly-sur-Seine", "Sarcelles", "Les Abymes", "Vénissieux", "Clichy", "Lorient", "Pessac", "Ivry-sur-Seine", "Cergy", "Cayenne", "Niort", "Chambéry", "Montauban", "Saint-Quentin", "Villejuif", "Hyères", "Beauvais", "Cholet"]
+      city_name: ["Paris", "Marseille", "Lyon", "Toulouse", "Nice", "Nantes", "Strasbourg", "Montpellier", "Bordeaux", "Lille", "Rennes", "Reims", "Le Havre", "Saint-Étienne", "Toulon", "Grenoble", "Dijon", "Angers", "Saint-Denis", "Villeurbanne", "Le Mans", "Aix-en-Provence", "Brest", "Nîmes", "Limoges", "Clermont-Ferrand", "Tours", "Amiens", "Metz", "Perpignan", "Besançon", "Orléans", "Boulogne-Billancourt", "Mulhouse", "Rouen", "Caen", "Nancy", "Saint-Denis", "Saint-Paul", "Montreuil", "Argenteuil", "Roubaix", "Dunkerque14", "Tourcoing", "Nanterre", "Avignon", "Créteil", "Poitiers", "Fort-de-France", "Courbevoie", "Versailles", "Vitry-sur-Seine", "Colombes", "Pau", "Aulnay-sous-Bois", "Asnières-sur-Seine", "Rueil-Malmaison", "Saint-Pierre", "Antibes", "Saint-Maur-des-Fossés", "Champigny-sur-Marne", "La Rochelle", "Aubervilliers", "Calais", "Cannes", "Le Tampon", "Béziers", "Colmar", "Bourges", "Drancy", "Mérignac", "Saint-Nazaire", "Valence", "Ajaccio", "Issy-les-Moulineaux", "Villeneuve-d'Ascq", "Levallois-Perret", "Noisy-le-Grand", "Quimper", "La Seyne-sur-Mer", "Antony", "Troyes", "Neuilly-sur-Seine", "Sarcelles", "Les Abymes", "Vénissieux", "Clichy", "Lorient", "Pessac", "Ivry-sur-Seine", "Cergy", "Cayenne", "Niort", "Chambéry", "Montauban", "Saint-Quentin", "Villejuif", "Hyères", "Beauvais", "Cholet"]
      city:
        - "#{city_name}"
      street_suffix: ["de l'Abbaye", "Adolphe Mille", "d'Alésia", "d'Argenteuil", "d'Assas", "du Bac", "de Paris", "La Boétie", "Bonaparte", "de la Bûcherie", "de Caumartin", "Charlemagne", "du Chat-qui-Pêche", "de la Chaussée-d'Antin", "du Dahomey", "Dauphine", "Delesseux", "du Faubourg Saint-Honoré", "du Faubourg-Saint-Denis", "de la Ferronnerie", "des Francs-Bourgeois", "des Grands Augustins", "de la Harpe", "du Havre", "de la Huchette", "Joubert", "Laffitte", "Lepic", "des Lombards", "Marcadet", "Molière", "Monsieur-le-Prince", "de Montmorency", "Montorgueil", "Mouffetard", "de Nesle", "Oberkampf", "de l'Odéon", "d'Orsel", "de la Paix", "des Panoramas", "Pastourelle", "Pierre Charron", "de la Pompe", "de Presbourg", "de Provence", "de Richelieu", "de Rivoli", "des Rosiers", "Royale", "d'Abbeville", "Saint-Honoré", "Saint-Bernard", "Saint-Denis", "Saint-Dominique", "Saint-Jacques", "Saint-Séverin", "des Saussaies", "de Seine", "de Solférino", "Du Sommerard", "de Tilsitt", "Vaneau", "de Vaugirard", "de la Victoire", "Zadkine"]
@ -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"]

--- a/src/main/resources/hu.yml
+++ b/src/main/resources/hu.yml
--- a/src/main/resources/it.yml
+++ b/src/main/resources/it.yml
@ -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"]
--- a/src/main/resources/pt-BR.yml
+++ b/src/main/resources/pt-BR.yml
@ -694,7 +694,4 @@ pt-BR:
        TO: ["MV[L-Z]-####", "MW?-####", "MX[A-G]-####", "OL[H-N]-####", "OY[A-C]-####", "QK[A-M]-####"]
    gender:
      types: ["Feminino", "Masculino", "Não Binário", "Agênero", "Gênero Fluido", "Gênero queer", "Bigênero", "Poligênero"]
-      binary_types: ["Feminino", "Masculino"]
-    creature:
-      animal:
-        name: ["jacaré", "crocodilo", "alpaca", "formiga", "antílope", "macaco", "tatu", "burro", "babuíno", "texugo", "morcego", "urso", "castor", "abelha", "besouro", "búfalo", "borboleta", "camelo", "búfalo-asiático", "caribu", "gato", "gado", "guepardo", "chimpanzé", "chinchila", "cigarra", "amêijoa", "barata", "bacalhau", "coiote", "caranguejo", "grilo", "corvo", "corvo-comum", "cervo", "dinossauro", "cachorro", "golfinho", "toninha", "pato", "águia", "enguia", "elefante", "alce", "furão", "peixe", "mosca", "raposa", "sapo", "rã" , "gerbilo", "girafa", "mosquito", "gnu", "gnu-cauda-preta", "cabra", "peixe-dourado", "ganso", "gorila", "gafanhoto", "porquinho da índia", "hamster", "lebre", "ouriço", "arenque", "hipopótamo", "vespa", "cavalo", "cão de caça", "hiena", "impala", "chacal", "água-viva", "canguru", "wallaby", "coala", "leopardo", "leão", "lagarto", "lhama", "gafanhoto", "piolho", "arara", "pato selvagem", "mamute", "peixe-boi", "marta", "vison", "vairão", "toupeira", "macaco", "alce", "mosquito", "rato", "ratazana", "mula", "rato almiscarado", "lontra", "boi", "ostra", "panda", "porco", "ornitorrinco", "porco-espinho", "cão da pradaria", "pug", "coelho", "guaxinim", "rena", "rinoceronte", "salmão", "sardinha", "escorpião", "foca", "leão-marinho", "serval", "tubarão", "ovelha", "gambá", "caracol", "cobra", "aranha", "esquilo", "cisne", "cupim", "tigre", "truta", "tartaruga", "jabuti", "morsa", "vespa", "doninha", "baleia", "lobo", "vombate", "marmota", "minhoca", "iaque", "vespa", "zebra"]
+      binary_types: ["Feminino", "Masculino"]
--- a/src/main/resources/pt.yml
+++ b/src/main/resources/pt.yml
@ -2,6 +2,8 @@ pt:
  faker:
    address:
      city_name: [Abrantes,Agualva-Cacém,Águeda,Albergaria-a-Velha,Albufeira,Alcácer do Sal,Alcobaça,Alfena,Almada,Almeirim,Alverca do Ribatejo,Amadora,Amarante,Amora,Anadia,Angra do Heroísmo,Aveiro,Barcelos,Barreiro,Beja,Borba,Braga,Bragança,Caldas da Rainha,Câmara de Lobos,Caniço,Cantanhede,Cartaxo,Castelo Branco,Chaves,Coimbra,Costa da Caparica,Covilhã,Elvas,Entroncamento,Ermesinde,Esmoriz,Espinho,Esposende,Estarreja,Estremoz,Évora,Fafe,Faro,Fátima,Felgueiras,Figueira da Foz,Fiães,Freamunde,Funchal,Fundão,Gafanha da Nazaré,Gandra,Gondomar,Gouveia,Guarda,Guimarães,Horta,Ílhavo,Lagoa,Lagoa,Lagos,Lamego,Leiria,Lisboa,Lixa,Loulé,Loures,Lourosa,Macedo de Cavaleiros,Machico,Maia,Mangualde,Marco de Canaveses,Marinha Grande,Matosinhos,Mealhada,Mêda,Miranda do Douro / Miranda de l Douro,Mirandela,Montemor-o-Novo,Montijo,Moura,Odivelas,Olhão da Restauração,Oliveira de Azeméis,Oliveira do Bairro,Oliveira do Hospital,Ourém,Ovar,Paços de Ferreira,Paredes,Penafiel,Peniche,Peso da Régua,Pinhel,Pombal,Ponta Delgada,Ponte de Sor,Portalegre,Portimão,Porto,Póvoa de Santa Iria,Póvoa de Varzim,Praia da Vitória,Quarteira,Queluz,Rebordosa,Reguengos de Monsaraz,Ribeira Grande,Rio Maior,Rio Tinto,Sabugal,Sacavém,Samora Correia,Santa Comba Dão,Santa Cruz,Santa Maria da Feira,Santana,Santarém,Santiago do Cacém,Santo Tirso,São João da Madeira,São Mamede de Infesta,São Pedro do Sul,Lordelo,Seia,Seixal,Senhora da Hora,Serpa,Setúbal,Silves,Sines,Tarouca,Tavira,Tomar,Tondela,Torres Novas,Torres Vedras,Trancoso,Trofa,Valbom,Vale de Cambra,Valença,Valongo,Valpaços,Vendas Novas,Viana do Castelo,Vila Baleira,Vila do Conde,Vila Franca de Xira,Vila Nova de Famalicão,Vila Nova de Foz Côa,Vila Nova de Gaia,Vila Nova de Santo André,Vila Real,Vila Real de Santo António,Viseu,Vizela]
+      city_prefix: ""
+      city_suffix: ""
      city:
        - "#{city_name}"
      country: [ "Afeganistão", "Albânia", "Algéria", "Samoa", "Andorra", "Angola", "Anguilla", "Antigua and Barbada", "Argentina", "Armênia", "Aruba", "Austrália", 
--- a/src/main/resources/ru.yml
+++ b/src/main/resources/ru.yml
@ -74,26 +74,3 @@ ru:
        - "#{prefix} #{Address.city_name}#{suffix}"
        - "#{prefix} #{Address.city_name}#{suffix}#{suffix}"
        - "#{prefix} #{Address.city_name}#{suffix}#{suffix}#{suffix}"
-
-  photography:
-    term: ["диафрагма", "выдержка", "фокусное расстояние", "плёнка", "вспышка", "зеркало", "отражение", "видоискатель", "горячий башмак", "затвор", "объектив", "35мм", "зерно", "боке", "фокус", "аберрации", "Ч/Б", "ISO", "ГРИПП", "зеркалка", "цифрозеркалка", "чёрный ключ", "белый ключ", "БДД", "чувствительность", "ISO"]
-    brand: ["Agfa", "Fujifilm", "Petnax", "Canon", "Casio", "Nikon", "Hama", "Olympus", "Sony", "Konica", "Minolta", "Konica Minolta", "Lumix", "Praktika", "Polaroid", "Panasonic", "Samsung", "Ricoh", "Tamron", "Sigma", "Арсенал", "БелОМО", "КМЗ", "Leica", "ЛОМО", "ФЭД", "Kodak", "Hasselblad", "llford", "Exacta", "Carl Zeiss", "Tokina", "Kenko", "Goerz", "Yashica", "Soligor GmbH", "ВОМЗ", "ЛЗОС"]
-    camera: ["ФЭД 1","ФЭД 2","ФЭД 3","ФЭД 4","ФЭД 5","КМЗ Москва-1","КМЗ Москва-2","КМЗ Москва-2A","КМЗ Москва-3","КМЗ Москва-4","КМЗ Москва-5", "КМЗ Искра", "КМЗ Искра-2", "Зоркий", "Зоркий-2", "Зоркий-3", "Зоркий-4", "Зоркий-10","Зоркий-11","Зоркий-12","Зоркий-15","Зоркий-16", "МИР",
-             "Зенит-200A",  "Зенит-200АФ",  "Зенит-200АФ-У",  "Зенит-200-2AФ",  "Зенит-200-Zoom",  "Зенит-компакт",  "Зенит-104",  "Зенит-501Р",  "Зенит-502Р",  "Зенит-503Х",  "Зенит-504Г",  "Зенит-510",  "Зенит-520",  "Зенит-610",  "Зенит-620",  "Зенит-630", "Зенит-АПС", "Зенит-96", "Зенит-E", "Зенит-E2", "Зенит-У", "Зенит-В", "Зенит-ЕМ", "Зенит-ЕМ2", "Зенит-ВМ", "Зенит-T1", "Зенит-ЕТ", "Зенит-ВЕ", "Зенит-10", "Зенит-11", "Зенит-50", "Зенит-М", "Зенит-2", "Зенит-ДМ3","Зенит-ДМ5", "Зенит-З1",
-             "Момент-20","Момент-20У",  "Зенит-70",  "Фотон",  "Фотон-2",  "Фотон-3",  "Фотон-M",  "Фотон-E",  "Фотон-ПАК",  "Фотон-автомат",  "Фотон-УФМ (Москва-УФМ)",  "Фотон-5",  "Фотон-23",  "Фотон-супер", "Панорама",
-             "Горизонт-202-1", "Горизонт-202-С", "Горизонт-компакт", "Горизонт-S3", "Горизонт-203", "ПанАрт-С3", "Горизонт-203-У500",  "Горизонт-С3-спорт",  "Горизонт-перфект",  "Горизонт-205",
-             "Старт",  "Старт-2", "Старт-3",  "Зенит-7", "Зенит-D", "Зенит-8", "Зенит-9", "Зенит-20", "Зенит-21", "Зенит-MK", "Зенит-22", "Зенит-23", "Зенит-MTL", "Зенит-7000",
-             "Фотоснайпер", "Фотоснайпер ФС-3", "Фотоснайпер ФС-4", "Фотоснайпер ФС-4M", "Фотоснайпер ФС-5", "Фотоснайпер ФС-12", "Фотоснайпер ФС-14", "Фотоснайпер ФС-122",
-             "Смена","Смена 2","Смена 3","Смена 4","Смена 6","Смена 8","Смена 11","Смена 12","Смена 7","Смена 9",
-             "Киев 2","Киев 3","Киев 4","Киев 5","Киев 6","Киев 10","Киев 15","Киев 17","Киев 20","Киев 88","Киев 90","Салют S","Мираж 19M",
-             "ЛОМО-130A","ЛОМО-135M","ЛОМО-Компакт", "Алмаз 104", "Алмаз 101",
-             "Canon EOS 1000D", "Canon EOS 1100D", "Canon EOS 1300D", "Canon EOS 2000D", "Canon EOS 4000D", "Canon EOS 300D", "Canon EOS 350D", "Canon EOS 400D", "Canon EOS 450D", "Canon EOS 500D", "Canon EOS 550D", "Canon EOS 600D", "Canon EOS 650D", "Canon EOS 700D", "Canon EOS 750D", "Canon EOS 760D", "Canon EOS 800D", "Canon EOS 10D", "Canon EOS 20D", "Canon EOS 30D", "Canon EOS 40D", "Canon EOS 50D", "Canon EOS 60D", "Canon EOS 70D", "Canon EOS 77D", "Canon EOS 80D", "Canon EOS 90D", "Canon EOS-1D", "Canon EOS-1D Mark II", "Canon EOS-1D Mark III", "Canon EOS-1D Mark IV", "Canon EOS-1Ds", "Canon EOS-1D X", "Canon EOS-1Ds", "Canon EOS-1Ds Mark II", "Canon EOS-1Ds Mark III", "Canon EOS 5D", "Canon EOS 5D Mark II", "Canon EOS 5D Mark III", "Canon EOS 5D Mark IV", "Canon EOS 5DS", "Canon EOS 6D", "Canon EOS 7D", "Canon EOS 7D Mark II", "Canon EOS M", "Canon EOS M2", "Canon EOS M3", "Canon EOS M5", "Canon EOS M6", "Canon EOS M50", "Canon EOS M100", "Canon PowerShot", "Canon PowerShot G", "Canon IXUS",  "Canon 7",  "Canon II",  "Canon P",  "Canon VT",  "Canonet",  "Canonet G-III QL17",   "Canon EOS R", "Canon EOS RP", "Canon EOS C200", "Canon EOS C300",  "Canon EOS C500",  "Canon EOS C100",  "Canon EOS C300 Mark II",  "Canon A-1",  "Canon AE-1",  "Canon AE-1 Program",  "Canon AL-1",  "Canon AT-1",  "Canon AV-1",  "Canon F-1",  "Canon New F-1",  "Canon FTb",  "Canon TLb",  "Canon TX",  "Canon T50",  "Canon T60",  "Canon T70",  "Canon T80",  "Canon T90",  "Canon FP",  "Canon FT QL",  "Canon FX",  "Canon Pellix",  "Canon Canonflex",  "Canon ELPH 490Z",
-             "Nikon D1", "Nikon D1H", "Nikon D1X", "Nikon D2H", "Nikon D2Hs", "Nikon D2X", "Nikon D2Xs", "Nikon D3", "Nikon D3S", "Nikon D3X", "Nikon D4", "Nikon D4S", "Nikon D5", "Nikon D40", "Nikon D40x", "Nikon D50",  "Nikon D60", "Nikon D70", "Nikon D70s", "Nikon D80", "Nikon D90", "Nikon D100", "Nikon D200", "Nikon D300", "Nikon D300S", "Nikon D500", "Nikon D600",  "Nikon D610", "Nikon D700", "Nikon D750", "Nikon D800", "Nikon D800E", "Nikon D810", "Nikon D810A", "Nikon D850", "Nikon D3000", "Nikon D3100", "Nikon D3200", "Nikon D3300", "Nikon D3400", "Nikon D3500", "Nikon D5000", "Nikon D5100", "Nikon D5200", "Nikon D5300", "Nikon D5500", "Nikon D5600", "Nikon D7000", "Nikon D7100", "Nikon D7200", "Nikon D7500", "Nikon E2", "Nikon E2N", "Nikon E2NS", "Nikon E2S", "Nikon E3", "Nikon E3s", "Nikon F3AF", "Nikon F4", "Nikonos RS", "Nikon F5", "Nikon F6", "Nikon F-501", "Nikon F-801", "Nikon F-801S", "Nikon F90", "Nikon F90X", "Nikon F80", "Nikon F100", "Nikon F-601", "Nikon F70", "Nikon F75", "Nikon F-401", "Nikon F-401S", "Nikon F-401X", "Nikon F50", "Nikon F60", "Nikon F65", "Nikon F55", "Nikon I","Nikon M","Nikon S","Nikon S2","Nikon SP","Nikon S3","Nikon S4","Nikon S3M","Nikon S3","Nikon SP",
-             "Leica S", "Leica S-E", "Leica S2","Leica II",
-             "Pentax 645D", "Pentax 645Z","Pentax *ist D","Pentax *ist DL","Pentax *ist DL2","Pentax *ist DS","Pentax *ist DS2", "Pentax K-1","Pentax K-3","Pentax K-3 II","Pentax K-5","Pentax K-5 II","Pentax K-30","Pentax K-50","Pentax K-70", "Pentax K-r","Pentax K-S1","Pentax K-S2","Pentax K-x","Pentax K-7","Pentax K10D","Pentax K20D","Pentax K100D","Pentax K100D Super",  "Pentax K110D","Pentax K200D","Pentax K2000","Pentax KP","Pentax MZ-D",
-             "Olympus E-1", "Olympus E-3", "Olympus E-5", "Olympus E-10", "Olympus E-20", "Olympus E-30", "Olympus E-300", "Olympus E-330", "Olympus E-400", "Olympus E-410", "Olympus E-420", "Olympus E-450", "Olympus E-500", "Olympus E-510", "Olympus E-520", "Olympus E-620",
-             "Fujix DS-560", "Fujix DS-565", "FinePix IS Pro", "FinePix S1 Pro", "FinePix S2 Pro", "FinePix S3 Pro", "FinePix S3 Pro UVIR", "FinePix S5 Pro",
-             "Sony Alpha 100", "Sony Alpha 200", "Sony Alpha 230", "Sony Alpha 290", "Sony Alpha 300", "Sony Alpha 330", "Sony Alpha 350", "Sony α390",      "Sony Alpha 500", "Sony Alpha 550", "Sony Alpha 580", "Sony Alpha 700", "Sony Alpha 850", "Sony Alpha 900", "Sony DSLR-A100", "Sony DSLR-A100/B", "Sony DSLR-A100/S", "Sony DSLR-A200", "Sony DSLR-A230", "Sony DSLR-A290", "Sony DSLR-A300", "Sony DSLR-A300/N", "Sony DSLR-A330", "Sony DSLR-A330/T", "Sony DSLR-A350", "Sony DSLR-A350/N", "Sony DSLR-A380", "Sony DSLR-A390", "Sony DSLR-A450", "Sony DSLR-A500", "Sony DSLR-A550", "Sony DSLR-A560", "Sony DSLR-A580", "Sony DSLR-A700", "Sony DSLR-A850", "Sony DSLR-A900"]
-    lens: ["500мм/8", "17мм/2.0", "35мм/1.8", "50мм/1.2", "50мм/1.4", "50мм/1.8", "17-85мм/4.0-8.0", "85мм/1.2", "40мм/2.8", "70–300мм/4.5–5.6", "300мм/2.8", "35-350мм/3.5-5.6", "75-300мм/4-5.6", "24мм/1.4", "17–40мм/4", "24–105мм/4", "70–200мм/2.8", "70–200мм/4", "200-400мм/4", "85мм/1.8", "135мм/4", "600мм/4", "800мм/5.6", "18–55мм/3.5–5.6", "55–250мм/4–5.6", "10-24мм/3.5-4.5", "12-24мм/4", "16-85мм/3.5-5.6", "17-55мм/2.8", "18-55мм/3.5-5.6", "18-70мм/3.5-4.5", "18-105мм/3.5-5.6", "18-140мм/3.5-5.6", "18-200мм/3.5-5.6", "18-300мм/3.5-5.6", "18-300мм/3.5-6.3", "55-200мм/4-5.6", "рыбий глаз", "теле", "широкоугольный"]
-    genre: ["Абстракция", "Портрет", "Пейзаж", "Техника", "Транспорт", "Авиация", "Поезда", "Корабли", "Автомобили", "Велосипеды", "Армейское", "ВМФ", "Флора", "Фауна", "Спорт", "Улица", "Город", "Деревня", "за городом", "Архитектура", "Интерьер", "Пища", "Свадьба", "Из готового", "Папарацци", "Общественное", "Мода", "Красота", "Ню", "Наука", "Космос", "Воздушное", "Промышленное", "Искусство", "Под водой", "Ночь", "чёрный ключ", "белый ключ", "ЛОМО", "Панорама", "Макро", "Микро", "Нано"]
-    imagetag: ["Ч/Б", "стена", "небо", "облака", "трава", "дерево", "улица", "город", "техника", "самобеги", "вагоны", "повозки", "самолёты", "люди", "чай", "кофе", "ресторан", "лес", "луг", "гора", "вода", "река", "солнечно", "облачно", "дождливо", "дождь", "волна", "капля", "девушка", "кирпич", "океан", "море", "речушка", "весна", "пружина", "фестиваль", "празднование", "представление", "танцы", "вселенная", "звёзды", "галактика", "МИР", "МКС", "ракета", "реактивный самолёт", "боец", "истребитель", "певец", "действие", "показ", "театр", "представление"]
--- a/src/main/resources/uk.yml
+++ b/src/main/resources/uk.yml
--- a/src/test/java/com/github/javafaker/AddressTest.java
+++ b/src/test/java/com/github/javafaker/AddressTest.java
@ -108,12 +108,6 @@ 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"));
--- a/src/test/java/com/github/javafaker/AquaTeenHungerForceTest.java
+++ b/src/test/java/com/github/javafaker/AquaTeenHungerForceTest.java
@ -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 .]+"));
-    }
-
-}
--- a/src/test/java/com/github/javafaker/AviationTest.java
+++ b/src/test/java/com/github/javafaker/AviationTest.java
@ -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());
-    }
-}
+}
--- a/src/test/java/com/github/javafaker/BarcodeTest.java
+++ b/src/test/java/com/github/javafaker/BarcodeTest.java
@ -1,28 +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 BarcodeTest extends AbstractFakerTest {
-
-    @Test
-    public void type() {
-        assertThat(faker.barcode().type(),
-                matchesRegularExpression("(Code(128|39|93))|(E|J)AN(-\\d{1,2})*|Codabar|UCC|UPC(-(A|E))*|IS(B|S)N|ITF|" +
-                        "Ames\\sCode|NW-7|Monarch|Code\\s2\\sof\\s7|Rationalized|ANSI\\/AIM BC3-1995|USD-4|" +
-                        "GS1 Databar|MSI Plessey"));
-    }
-
-    @Test
-    public void data(){
-        assertThat(faker.barcode().data(), matchesRegularExpression("\\d+"));
-    }
-
-    @Test
-    public void typeAndData(){
-        assertThat(faker.barcode().typeAndData(), matchesRegularExpression("(\\w|\\W)+\\s\\d+$"));
-    }
-
-}
--- a/src/test/java/com/github/javafaker/BasketballTest.java
+++ b/src/test/java/com/github/javafaker/BasketballTest.java
@ -1,74 +0,0 @@
-package com.github.javafaker;
-
-import com.github.javafaker.AbstractFakerTest;
-import com.github.javafaker.Faker;
-import org.junit.Test;
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-public class BasketballTest extends AbstractFakerTest {
-
-    @Test
-    public void testPositions(){
-        Faker faker=new Faker();
-        assertThat(faker.basketball().positions(),matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+")); }
-
-    @Test
-    public void testTeams(){
-        Faker faker=new Faker();
-        assertThat(faker.basketball().teams(),matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+")); }
-
-    @Test
-    public void testCoaches(){
-        Faker faker=new Faker();
-        assertThat(faker.basketball().coaches(),matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+")); }
-
-    @Test
-    public void testPlayers(){
-        Faker faker=new Faker();
-        assertThat(faker.basketball().players(),matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+")); }
-
-    @Test
-    public void testPositionsWith10000Times(){
-        Faker faker=new Faker();
-        boolean isExist=false;
-        for(int i=0;i<10000;i++){
-            String generateString=faker.basketball().positions();
-            if(generateString.equals("Point Guard")){isExist=true;}
-        }
-        assertTrue(isExist);
-    }
-
-    @Test
-    public void testTeamsWith10000Times(){
-        Faker faker=new Faker();
-        boolean isExist=false;
-        for(int i=0;i<10000;i++){
-            String generateString=faker.basketball().teams();
-            if(generateString.equals("Atlanta Hawks")){isExist=true;}
-        }
-        assertTrue(isExist);
-    }
-
-    @Test
-    public void testCoachesWith10000Times(){
-        Faker faker=new Faker();
-        boolean isExist=false;
-        for(int i=0;i<10000;i++){
-            String generateString=faker.basketball().coaches();
-            if(generateString.equals("Kenny Atkinson")){isExist=true;}
-        }
-        assertTrue(isExist);
-    }
-
-    @Test
-    public void testPlayersWith10000Times(){
-        Faker faker=new Faker();
-        boolean isExist=false;
-        for(int i=0;i<10000;i++){
-            String generateString=faker.basketball().players();
-            if(generateString.equals("Joel Embiid")){isExist=true;}
-        }
-        assertTrue(isExist); }
-}
--- a/src/test/java/com/github/javafaker/BojackHorsemanTest.java
+++ b/src/test/java/com/github/javafaker/BojackHorsemanTest.java
@ -1,62 +0,0 @@
-package com.github.javafaker;
-
-import com.github.javafaker.AbstractFakerTest;
-import com.github.javafaker.Faker;
-import org.junit.Test;
-
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.junit.Assert.*;
-
-public class BojackHorsemanTest extends AbstractFakerTest {
-
-    @Test
-    public void testCharacters1(){
-        Faker faker=new Faker();
-        assertThat(faker.bojackHorseman().characters(),matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+")); }
-
-    @Test
-    public void testQuotes1(){
-        Faker faker=new Faker();
-        assertFalse(faker.bojackHorseman().quotes().isEmpty()); }
-
-    @Test
-    public void testTongueTwisters1(){
-        Faker faker=new Faker();
-        assertFalse(faker.bojackHorseman().tongueTwisters().isEmpty());}
-
-    @Test
-    public void testCharactersWith10000Times(){
-        Faker faker=new Faker();
-        boolean isExist=false;
-        for(int i=0;i<10000;i++){
-            String generateString=faker.bojackHorseman().characters();
-            if(generateString.equals("Joseph Sugarman")){isExist=true;}
-        }
-       assertTrue(isExist);
-    }
-
-    @Test
-    public void testQuotesWith10000Times(){
-        Faker faker=new Faker();
-        boolean isExist=false;
-        for(int i=0;i<10000;i++){
-            String generateString=faker.bojackHorseman().quotes();
-            if(generateString.equals("It gets easier. But you have to do it every day, that's the hard part. But it does get easier"))
-                {isExist=true;}
-        }
-        assertTrue(isExist);
-    }
-
-    @Test
-    public void testTongueTwistersWith10000Times(){
-        Faker faker=new Faker();
-        boolean isExist=false;
-        for(int i=0;i<10000;i++){
-            String generateString=faker.bojackHorseman().tongueTwisters();
-            if(generateString.equals("Courtly roles like the formerly portly consort are Courtney Portnoy's forté"))
-                {isExist=true;}
-        }
-        assertTrue(isExist);
-    }
-
-}
--- a/src/test/java/com/github/javafaker/BusinessTest.java
+++ b/src/test/java/com/github/javafaker/BusinessTest.java
@ -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());
-    }
-
-}
--- a/src/test/java/com/github/javafaker/CoinTest.java
+++ b/src/test/java/com/github/javafaker/CoinTest.java
@ -1,14 +0,0 @@
-package com.github.javafaker;
-
-import static org.junit.Assert.assertThat;
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-
-import org.junit.Test;
-
-public class CoinTest extends AbstractFakerTest {
-
-    @Test
-    public void coinFlip() {
-        assertThat(faker.coin().flip(), matchesRegularExpression("\\w+"));
-    }
-}
--- a/src/test/java/com/github/javafaker/CountryTest.java
+++ b/src/test/java/com/github/javafaker/CountryTest.java
@ -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
--- a/src/test/java/com/github/javafaker/DateAndTimeTest.java
+++ b/src/test/java/com/github/javafaker/DateAndTimeTest.java
@ -4,12 +4,14 @@
 package com.github.javafaker;

 import org.junit.Test;
+
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.concurrent.TimeUnit;
+
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;

 /**
 * @author pmiklos
@ -78,25 +80,14 @@ public class DateAndTimeTest extends AbstractFakerTest {
            assertThat("before lower bound", date.getTime(), greaterThanOrEqualTo(now.getTime()));
        }
    }
-    @Test
-    public void testBetweenThenLargerThanNow(){
-        try{
-        Date now = new Date();
-        Date then = new Date(now.getTime() + 1000);
-        Date date =faker.date().between(then,now);
-        fail("Should be exception");}catch (IllegalArgumentException e){
-            assertEquals("Invalid date range, the upper bound date is before the lower bound.", e.getMessage());
-        }
-    }
+
    @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));
@ -106,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));
        }
    }
--- a/src/test/java/com/github/javafaker/DiseaseTest.java
+++ b/src/test/java/com/github/javafaker/DiseaseTest.java
@ -1,109 +0,0 @@
-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.*;
-
-public class DiseaseTest extends AbstractFakerTest {
-    @Test
-    public void testInternalDisease() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().internalDisease(), matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+"));
-    }
-
-    @Test
-    public void testNeurology() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().neurology(), matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+"));
-    }
-
-    @Test
-    public void testSurgery() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().surgery(), matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+"));
-    }
-
-    @Test
-    public void testPaediatrics() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().paediatrics(), matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+"));
-    }
-
-    @Test
-    public void testGynecologyAndObstetrics() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().gynecologyAndObstetrics(), matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+"));
-    }
-
-    @Test
-    public void testOphthalmologyAndOtorhinolaryngology() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().ophthalmologyAndOtorhinolaryngology(), matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+"));
-    }
-
-    @Test
-    public void testDermatolory() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().dermatolory(), matchesRegularExpression("[\\p{L}'()\\., 0-9-’’]+"));
-    }
-
-
-    @Test
-    public void testInternalDiseaseWith10000Times() {
-        Faker faker = new Faker();
-        boolean isExist = false;
-        for (int i = 0; i < 10000; i++) {
-            String generateString = faker.disease().internalDisease();
-            if (generateString.equals("anaphylaxis")) {
-                isExist = true;
-            }
-        }
-        assertTrue(isExist);
-    }
-
-    @Test
-    @Repeat(times = 10000)
-    public void testNeurologyWith10000Times() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().neurology(), isStringWithContents());
-    }
-
-    @Test
-    @Repeat(times = 10000)
-    public void testSurgeryWith10000Times() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().surgery(), isStringWithContents());
-    }
-
-    @Test
-    @Repeat(times = 10000)
-    public void testPaediatricsWith10000Times() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().paediatrics(), isStringWithContents());
-    }
-
-    @Test
-    @Repeat(times = 10000)
-    public void testGynecologyAndObstetricsWith10000Times() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().gynecologyAndObstetrics(), isStringWithContents());
-    }
-
-    @Test
-    @Repeat(times = 10000)
-    public void testOphthalmologyAndOtorhinolaryngologyWith10000Times() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().ophthalmologyAndOtorhinolaryngology(), isStringWithContents());
-    }
-
-    @Test
-    @Repeat(times = 10000)
-    public void testDermatoloryWith10000Times() {
-        Faker faker = new Faker();
-        assertThat(faker.disease().dermatolory(), isStringWithContents());
-    }
-
-}
--- a/src/test/java/com/github/javafaker/DuneTest.java
+++ b/src/test/java/com/github/javafaker/DuneTest.java
@ -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}+"));
-    }
-
-}
--- a/src/test/java/com/github/javafaker/ElderScrollsTest.java
+++ b/src/test/java/com/github/javafaker/ElderScrollsTest.java
@ -44,9 +44,4 @@ public class ElderScrollsTest extends AbstractFakerTest  {
    public void testRegion() {
        assertThat(faker.elderScrolls().region(), not(isEmptyOrNullString()));
    }
-
-    @Test
-    public void testQuote() {
-        assertThat(faker.elderScrolls().quote(), not(isEmptyOrNullString()));
-    }
 }
--- a/src/test/java/com/github/javafaker/EnglandFootBallTest.java
+++ b/src/test/java/com/github/javafaker/EnglandFootBallTest.java
@ -1,27 +0,0 @@
-package com.github.javafaker;
-
-
-import org.junit.Test;
-
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-
-public class EnglandFootBallTest extends AbstractFakerTest{
-
-
-
-    @Test
-    public void testLeague() {
-        String league = faker.englandfootball().league();
-        assertThat(league, not(isEmptyOrNullString()));
-
-    }
-
-    @Test
-    public void testTeam() {
-        String team = faker.englandfootball().team();
-        assertThat(team, not(isEmptyOrNullString()));
-
-    }
-}
--- a/src/test/java/com/github/javafaker/FakerTest.java
+++ b/src/test/java/com/github/javafaker/FakerTest.java
@ -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;
--- a/src/test/java/com/github/javafaker/FoodTest.java
+++ b/src/test/java/com/github/javafaker/FoodTest.java
@ -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}"));
--- a/src/test/java/com/github/javafaker/GenderTest.java
+++ b/src/test/java/com/github/javafaker/GenderTest.java
@ -1,25 +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 GenderTest extends AbstractFakerTest {
-
-    @Test
-    public void types() {
-        assertThat(faker.gender().types(), matchesRegularExpression("(\\w+ ?){1,2}"));
-    }
-
-    @Test
-    public void binaryTypes() {
-        assertThat(faker.gender().binaryTypes(), matchesRegularExpression("[A-Za-z ]+"));
-    }
-
-    @Test
-    public void shortBinaryTypes() {
-        assertThat(faker.gender().shortBinaryTypes(), matchesRegularExpression("f|m"));
-    }
-
-}
--- a/src/test/java/com/github/javafaker/HarryPotterTest.java
+++ b/src/test/java/com/github/javafaker/HarryPotterTest.java
@ -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 ]+"));
-    }
 }
--- a/src/test/java/com/github/javafaker/InternetTest.java
+++ b/src/test/java/com/github/javafaker/InternetTest.java
@ -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;
@ -13,7 +14,16 @@ import java.util.Locale;
 import static com.github.javafaker.matchers.CountOfCharactersMatcher.countOf;
 import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static java.lang.Integer.parseInt;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.both;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertThat;

 public class InternetTest extends AbstractFakerTest {
@ -188,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)));
        }
    }
@ -247,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)));
        }
    }
@ -292,10 +302,4 @@ public class InternetTest extends AbstractFakerTest {
        //Test faker.internet().userAgentAny() for random user_agent retrieval.
        assertThat(faker.internet().userAgentAny(), not(isEmptyOrNullString()));
    }
-
-    @Test
-    public void testSlugWithNull(){
-        Faker f=new Faker();
-        assertThat(f.internet().slug(null,"_"),notNullValue());
-    }
 }
--- a/src/test/java/com/github/javafaker/KaamelottTest.java
+++ b/src/test/java/com/github/javafaker/KaamelottTest.java
@ -1,19 +0,0 @@
-package com.github.javafaker;
-
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-
-public class KaamelottTest extends AbstractFakerTest {
-
-    @Test
-    public void testCharacter() {
-        assertThat(faker.kaamelott().character(), matchesRegularExpression("[A-Za-z' -ÇÉàçêèéïîüùú]+"));
-    }
-
-    @Test
-    public void testQuote() {
-        assertThat(faker.kaamelott().quote(), matchesRegularExpression("[-A-Za-z0-9 —ÇÉàçêèéïîüùú;:…\\?\\!\\.’‘'”“,\\[\\]]+"));
-    }
-}
--- a/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java
+++ b/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java
@ -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
--- a/src/test/java/com/github/javafaker/LoremTest.java
+++ b/src/test/java/com/github/javafaker/LoremTest.java
@ -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)));
-    }
 }
--- a/src/test/java/com/github/javafaker/MountainTest.java
+++ b/src/test/java/com/github/javafaker/MountainTest.java
@ -1,21 +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 MountainTest extends AbstractFakerTest {
-    @Test
-    public void testMountainName() {
-        String mountainName = faker.mountain().name();
-        assertThat(mountainName, not(isEmptyOrNullString()));
-    }
-
-    @Test
-    public void testMountainLeague() {
-        String mountainLeague = faker.mountain().range();
-        assertThat(mountainLeague, not(isEmptyOrNullString()));
-    }
-}
--- a/src/test/java/com/github/javafaker/NameTest.java
+++ b/src/test/java/com/github/javafaker/NameTest.java
@ -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)[+-]"));
-    }

 }
--- a/src/test/java/com/github/javafaker/NationTest.java
+++ b/src/test/java/com/github/javafaker/NationTest.java
@ -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'));
-    }
-
-}
--- a/src/test/java/com/github/javafaker/NumberTest.java
+++ b/src/test/java/com/github/javafaker/NumberTest.java
@ -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
--- a/src/test/java/com/github/javafaker/OverwatchTest.java
+++ b/src/test/java/com/github/javafaker/OverwatchTest.java
@ -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;
--- a/src/test/java/com/github/javafaker/PhotographyTest.java
+++ b/src/test/java/com/github/javafaker/PhotographyTest.java
@ -1,71 +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.*;
-
-public class PhotographyTest extends AbstractFakerTest{
-
-    @Test
-    public void testAperture() {
-        final String value = faker.photography().aperture();
-        assertTrue(value.startsWith("f"));
-    }
-
-    @Test
-    public void testTerm() {
-        final String value = faker.photography().term();
-        assertNonNullOrEmpty(value);
-    }
-
-    @Test
-    public void brand() {
-        final String value = faker.photography().brand();
-        assertNonNullOrEmpty(value);
-    }
-
-    @Test
-    public void camera() {
-        final String value = faker.photography().camera();
-        assertNonNullOrEmpty(value);
-    }
-
-    @Test
-    public void lens() {
-        final String value = faker.photography().lens();
-        assertNonNullOrEmpty(value);
-    }
-
-    @Test
-    public void genre() {
-        final String value = faker.photography().genre();
-        assertNonNullOrEmpty(value);
-    }
-
-    @Test
-    public void imageTag() {
-        final String value = faker.photography().imageTag();
-        assertNonNullOrEmpty(value);
-    }
-
-    @Test
-    @Repeat(times=7)
-    public void shutter() {
-        final String value = faker.photography().shutter();
-        assertThat(value, matchesRegularExpression("\\d{1,}\\/{0,1}\\d*"));
-    }
-
-    @Test
-    @Repeat(times=7)
-    public void iso() {
-        final String value = faker.photography().iso();
-        assertThat(value, matchesRegularExpression("\\d{1,}"));
-    }
-
-    private void assertNonNullOrEmpty(String value) {
-        assertNotNull(value);
-        assertFalse(value.isEmpty());
-    }
-}
--- a/src/test/java/com/github/javafaker/ProgrammingLanguageTest.java
+++ b/src/test/java/com/github/javafaker/ProgrammingLanguageTest.java
@ -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 .,\\-]+"));
-    }
-
-}
--- a/src/test/java/com/github/javafaker/RelationshipTest.java
+++ b/src/test/java/com/github/javafaker/RelationshipTest.java
@ -1,83 +1,46 @@
-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();
-    }
-
-}
+package com.github.javafaker;
+
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class RelationshipTest extends AbstractFakerTest {
+    
+    @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()));
+    }
+
+}
--- a/src/test/java/com/github/javafaker/SipTest.java
+++ b/src/test/java/com/github/javafaker/SipTest.java
@ -1,141 +0,0 @@
-package com.github.javafaker;
-
-import org.junit.Test;
-
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.hamcrest.Matchers.both;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.lessThan;
-import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.assertThat;
-
-public class SipTest extends AbstractFakerTest {
-
-    @Test
-    public void method_returnUpperCaseWithMinimum3Chars() {
-        assertThat(faker.sip().method(), matchesRegularExpression("^[A-Z]{3,}$"));
-    }
-
-    @Test
-    public void contentType_returnLowerCaseTwoWordsSepereatedBySlashMinimum3And4Chars() {
-        assertThat(faker.sip().contentType(), matchesRegularExpression("^[a-z]{4,}[/]{1,}[a-z0-9-]{3,}$"));
-    }
-
-    @Test
-    public void messagingPort_return4DigitIntBetween1000And9999() {
-        assertThat(faker.sip().messagingPort(), both(greaterThanOrEqualTo(1000)).and(lessThan(10000)));
-    }
-
-    @Test
-    public void rtpPort_returnPositiveEvenInt() {
-        int sut = faker.sip().rtpPort();
-        assertThat(sut, greaterThanOrEqualTo(2));
-        assertThat(sut % 2, is(0));
-    }
-
-    @Test
-    public void provisionalResponseCode_return3DigitIntBetween100And199() {
-        assertThat(faker.sip().provisionalResponseCode(), both(greaterThanOrEqualTo(100)).and(lessThan(200)));
-    }
-
-    @Test
-    public void successResponse_Codereturn3DigitIntBetween200And299() {
-        assertThat(faker.sip().successResponseCode(), both(greaterThanOrEqualTo(200)).and(lessThan(300)));
-    }
-
-    @Test
-    public void redirectResponseCode_Codereturn3DigitIntBetween300And399() {
-        assertThat(faker.sip().redirectResponseCode(), both(greaterThanOrEqualTo(300)).and(lessThan(400)));
-    }
-
-    @Test
-    public void clientErrorResponseCode_Codereturn3DigitIntBetween400And499() {
-        assertThat(faker.sip().clientErrorResponseCode(), both(greaterThanOrEqualTo(400)).and(lessThan(500)));
-    }
-
-    @Test
-    public void serverErrorResponseCode_Codereturn3DigitIntBetween500And599() {
-        assertThat(faker.sip().serverErrorResponseCode(), both(greaterThanOrEqualTo(500)).and(lessThan(600)));
-    }
-
-    @Test
-    public void globalErrorResponseCode_Codereturn3DigitIntBetween600And699() {
-        assertThat(faker.sip().globalErrorResponseCode(), both(greaterThanOrEqualTo(600)).and(lessThan(700)));
-    }
-
-    @Test
-    public void provisionalResponsePhrase_returnAnyNonDigitString() {
-        assertThat(faker.sip().provisionalResponsePhrase(), matchesRegularExpression("\\D+"));
-    }
-
-    @Test
-    public void successResponsePhrase_returnAnyNonDigitString() {
-        assertThat(faker.sip().successResponsePhrase(), matchesRegularExpression("\\D+"));
-    }
-
-    @Test
-    public void redirectResponsePhrase_returnAnyNonDigitString() {
-        assertThat(faker.sip().redirectResponsePhrase(), matchesRegularExpression("\\D+"));
-    }
-
-    @Test
-    public void clientErrorResponsePhrase_returnAnyNonDigitString() {
-        assertThat(faker.sip().clientErrorResponsePhrase(), matchesRegularExpression("\\D+"));
-    }
-
-    @Test
-    public void serverErrorResponsePhrase_returnAnyNonDigitString() {
-        assertThat(faker.sip().serverErrorResponsePhrase(), matchesRegularExpression("\\D+"));
-    }
-
-    @Test
-    public void globalErrorResponsePhrase_returnAnyNonDigitString() {
-        assertThat(faker.sip().globalErrorResponsePhrase(), matchesRegularExpression("\\D+"));
-    }
-
-    @Test
-    public void bodyString_returnAValidSdpBodyString() {
-        String[] sut = faker.sip().bodyString().split("\n");
-
-        assertThat(sut.length, is(7));
-
-        assertThat(sut[0], is("v=0"));
-
-        String[] secondLine = sut[1].split(" ");
-        assertThat(secondLine[0], startsWith("o="));
-        assertThat(secondLine[1], matchesRegularExpression("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"));
-        assertThat(secondLine[secondLine.length - 1], matchesRegularExpression("[a-z]+\\.\\w{2,4}"));
-
-        assertThat(sut[2], is("s=-"));
-
-        String[] fourthLine = sut[3].split(" ");
-        assertThat(fourthLine[0], is("c=IN"));
-        assertThat(fourthLine[fourthLine.length - 1], matchesRegularExpression("^\\d{1,3}.\\d{1,3}.\\d{1,3}.\\d{1,3}$"));
-
-        assertThat(sut[4], is("t=0 0"));
-
-        String[] sixthLine = sut[5].split(" ");
-        assertThat(sixthLine[0], is("m=audio"));
-        assertThat(Integer.parseInt(sixthLine[1]), greaterThanOrEqualTo(2));
-        assertThat(Integer.parseInt(sixthLine[1]) % 2, is(0));
-
-        assertThat(sut[6], is("a=rtpmap:0 PCMU/8000"));
-    }
-
-    @Test
-    public void bodyBytes_isNotNull() {
-        byte[] sut = faker.sip().bodyBytes();
-
-        assertThat(sut.length, notNullValue());
-    }
-
-    @Test
-    public void nameAddress_returnValidNameAddressString() {
-        String[] sut = faker.sip().nameAddress().split("@");
-
-        assertThat(sut[0].split(":")[1], matchesRegularExpression("\\w+"));
-        assertThat(sut[1].split(":")[0], matchesRegularExpression("^\\d{1,3}.\\d{1,3}.\\d{1,3}.\\d{1,3}$"));
-    }
-}
--- a/src/test/java/com/github/javafaker/StarCraftTest.java
+++ b/src/test/java/com/github/javafaker/StarCraftTest.java
@ -1,41 +0,0 @@
-package com.github.javafaker;
-
-import org.junit.Test;
-
-import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-
-public class StarCraftTest extends AbstractFakerTest {
-
-    private final String noLeadingTrailingWhitespaceRegex = "^(?! )[A-Za-z0-9' ]*(?<! )$";
-
-    @Test
-    public void testUnit() {
-        String unit = faker.starCraft().unit();
-        assertThat(unit, not(isEmptyOrNullString()));
-        assertThat(unit, matchesRegularExpression(noLeadingTrailingWhitespaceRegex));
-    }
-
-    @Test
-    public void testBuilding() {
-        String building = faker.starCraft().building();
-        assertThat(building, not(isEmptyOrNullString()));
-        assertThat(building, matchesRegularExpression(noLeadingTrailingWhitespaceRegex));
-    }
-
-    @Test
-    public void testCharacter() {
-        String character = faker.starCraft().character();
-        assertThat(character, not(isEmptyOrNullString()));
-        assertThat(character, matchesRegularExpression(noLeadingTrailingWhitespaceRegex));
-    }
-
-    @Test
-    public void testPlanet() {
-        String planet = faker.starCraft().planet();
-        assertThat(planet, not(isEmptyOrNullString()));
-        assertThat(planet, matchesRegularExpression(noLeadingTrailingWhitespaceRegex));
-    }
-
-}
--- a/Show More
+++ b/Show More