diff --git a/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java b/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java
new file mode 100644
index 000000000..b26635416
--- /dev/null
+++ b/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java
@@ -0,0 +1,155 @@
+package com.iluwatar.stepbuilder;
+
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Date: 12/29/15 - 9:21 PM
+ *
+ * @author Jeroen Meulemeester
+ */
+public class CharacterStepBuilderTest {
+
+  /**
+   * Build a new wizard {@link Character} and verify if it has the expected attributes
+   */
+  @Test
+  public void testBuildWizard() {
+    final Character character = CharacterStepBuilder.newBuilder()
+        .name("Merlin")
+        .wizardClass("alchemist")
+        .withSpell("poison")
+        .withAbility("invisibility")
+        .withAbility("wisdom")
+        .noMoreAbilities()
+        .build();
+
+    assertEquals("Merlin", character.getName());
+    assertEquals("alchemist", character.getWizardClass());
+    assertEquals("poison", character.getSpell());
+    assertNotNull(character.toString());
+
+    final List<String> abilities = character.getAbilities();
+    assertNotNull(abilities);
+    assertEquals(2, abilities.size());
+    assertTrue(abilities.contains("invisibility"));
+    assertTrue(abilities.contains("wisdom"));
+
+  }
+
+  /**
+   * Build a new wizard {@link Character} without spell or abilities and verify if it has the
+   * expected attributes
+   */
+  @Test
+  public void testBuildPoorWizard() {
+    final Character character = CharacterStepBuilder.newBuilder()
+        .name("Merlin")
+        .wizardClass("alchemist")
+        .noSpell()
+        .build();
+
+    assertEquals("Merlin", character.getName());
+    assertEquals("alchemist", character.getWizardClass());
+    assertNull(character.getSpell());
+    assertNull(character.getAbilities());
+    assertNotNull(character.toString());
+
+  }
+
+  /**
+   * Build a new wizard {@link Character} and verify if it has the expected attributes
+   */
+  @Test
+  public void testBuildWeakWizard() {
+    final Character character = CharacterStepBuilder.newBuilder()
+        .name("Merlin")
+        .wizardClass("alchemist")
+        .withSpell("poison")
+        .noAbilities()
+        .build();
+
+    assertEquals("Merlin", character.getName());
+    assertEquals("alchemist", character.getWizardClass());
+    assertEquals("poison", character.getSpell());
+    assertNull(character.getAbilities());
+    assertNotNull(character.toString());
+
+  }
+
+
+  /**
+   * Build a new warrior {@link Character} and verify if it has the expected attributes
+   */
+  @Test
+  public void testBuildWarrior() {
+    final Character character = CharacterStepBuilder.newBuilder()
+        .name("Cuauhtemoc")
+        .fighterClass("aztec")
+        .withWeapon("spear")
+        .withAbility("speed")
+        .withAbility("strength")
+        .noMoreAbilities()
+        .build();
+
+    assertEquals("Cuauhtemoc", character.getName());
+    assertEquals("aztec", character.getFighterClass());
+    assertEquals("spear", character.getWeapon());
+    assertNotNull(character.toString());
+
+    final List<String> abilities = character.getAbilities();
+    assertNotNull(abilities);
+    assertEquals(2, abilities.size());
+    assertTrue(abilities.contains("speed"));
+    assertTrue(abilities.contains("strength"));
+
+  }
+
+  /**
+   * Build a new wizard {@link Character} without weapon and abilities and verify if it has the
+   * expected attributes
+   */
+  @Test
+  public void testBuildPoorWarrior() {
+    final Character character = CharacterStepBuilder.newBuilder()
+        .name("Poor warrior")
+        .fighterClass("none")
+        .noWeapon()
+        .build();
+
+    assertEquals("Poor warrior", character.getName());
+    assertEquals("none", character.getFighterClass());
+    assertNull(character.getWeapon());
+    assertNull(character.getAbilities());
+    assertNotNull(character.toString());
+
+  }
+
+  /**
+   * Build a new warrior {@link Character} without any abilities, but with a weapon and verify if it
+   * has the expected attributes
+   */
+  @Test
+  public void testBuildWeakWarrior() {
+    final Character character = CharacterStepBuilder.newBuilder()
+        .name("Weak warrior")
+        .fighterClass("none")
+        .withWeapon("Slingshot")
+        .noAbilities()
+        .build();
+
+    assertEquals("Weak warrior", character.getName());
+    assertEquals("none", character.getFighterClass());
+    assertEquals("Slingshot", character.getWeapon());
+    assertNull(character.getAbilities());
+    assertNotNull(character.toString());
+
+  }
+
+}
\ No newline at end of file