diff --git a/src/main/java/dev/personnummer/Personnummer.java b/src/main/java/dev/personnummer/Personnummer.java
index 6079ef3..67df42f 100644
--- a/src/main/java/dev/personnummer/Personnummer.java
+++ b/src/main/java/dev/personnummer/Personnummer.java
@@ -1,8 +1,7 @@
 package dev.personnummer;
 
 import java.time.LocalDate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.regex.*;
 
 /**
  * Class used to validate Swedish personal identity numbers.
diff --git a/src/test/java/PersonnummerData.java b/src/test/java/PersonnummerData.java
index b86e6b3..8bf81ac 100644
--- a/src/test/java/PersonnummerData.java
+++ b/src/test/java/PersonnummerData.java
@@ -1,6 +1,6 @@
 public class PersonnummerData {
 
-    public PersonnummerData(Long integer, String longFormat, String shortFormat, String separatedFormat, String separatedLong, Boolean valid, String type, Boolean isMale, Boolean isFemale) {
+    public PersonnummerData(long integer, String longFormat, String shortFormat, String separatedFormat, String separatedLong, boolean valid, String type, boolean isMale, boolean isFemale) {
         this.integer = integer;
         this.longFormat = longFormat;
         this.shortFormat = shortFormat;
@@ -12,14 +12,14 @@ public PersonnummerData(Long integer, String longFormat, String shortFormat, Str
         this.isFemale = isFemale;
     }
 
-    public Long integer;
+    public long integer;
     public String longFormat;
     public String shortFormat;
     public String separatedFormat;
     public String separatedLong;
-    public Boolean valid;
+    public boolean valid;
     public String type;
-    public Boolean isMale;
+    public boolean isMale;
     public boolean isFemale;
 
 }