From e11143b6234348925556b8cac2c92c2cb98f2b61 Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Mon, 3 May 2021 14:46:21 -0700
Subject: [PATCH] Remove API that appears to be unnecessary with immutable
 types (#31)

---
 .../math/imaginary/Complex{{E}}.java.peb      | 25 ++--------------
 .../math/imaginary/Quaternion{{E}}.java.peb   | 23 +-------------
 .../math/matrix/Matrix2{{E}}.java.peb         | 29 +++++-------------
 .../math/matrix/Matrix3{{E}}.java.peb         | 29 ++++--------------
 .../math/matrix/Matrix4{{E}}.java.peb         | 30 +++++--------------
 .../math/vector/Vector2{{E}}.java.peb         | 15 +---------
 .../math/vector/Vector3{{E}}.java.peb         | 15 +---------
 .../math/vector/Vector4{{E}}.java.peb         | 15 +---------
 .../math/vector/Vector2{{E}}.java.peb         | 15 +---------
 .../math/vector/Vector3{{E}}.java.peb         | 15 +---------
 .../math/vector/Vector4{{E}}.java.peb         | 15 +---------
 .../test/imaginary/Complex{{E}}Test.java.peb  | 16 ++--------
 .../imaginary/Quaternion{{E}}Test.java.peb    | 16 ++--------
 .../test/matrix/Matrix2{{E}}Test.java.peb     | 16 ++--------
 .../test/matrix/Matrix3{{E}}Test.java.peb     | 16 ++--------
 .../test/matrix/Matrix4{{E}}Test.java.peb     | 28 ++---------------
 .../test/vector/Vector2{{E}}Test.java.peb     | 16 ++--------
 .../test/vector/Vector3{{E}}Test.java.peb     | 16 ++--------
 .../test/vector/Vector4{{E}}Test.java.peb     | 16 ++--------
 .../test/vector/VectorN{{E}}Test.java.peb     |  1 +
 .../test/vector/Vector2{{E}}Test.java.peb     | 16 ++--------
 .../test/vector/Vector3{{E}}Test.java.peb     | 16 ++--------
 .../test/vector/Vector4{{E}}Test.java.peb     | 16 ++--------
 23 files changed, 53 insertions(+), 362 deletions(-)

diff --git a/src/main/template/float/org/spongepowered/math/imaginary/Complex{{E}}.java.peb b/src/main/template/float/org/spongepowered/math/imaginary/Complex{{E}}.java.peb
index 1d4572b..358384e 100644
--- a/src/main/template/float/org/spongepowered/math/imaginary/Complex{{E}}.java.peb
+++ b/src/main/template/float/org/spongepowered/math/imaginary/Complex{{E}}.java.peb
@@ -14,7 +14,7 @@ import org.spongepowered.math.vector.Vector3{{ E }};
  * Represent a complex number of the form {@code x + yi}. The x and y components are stored as {@code {{ e }}}s. This class is immutable.
  */
 @Immutable
-public final class Complex{{ E }} implements Imaginary{{ E }}, Comparable<Complex{{ E }}>, Serializable, Cloneable {
+public final class Complex{{ E }} implements Imaginary{{ E }}, Comparable<Complex{{ E }}>, Serializable {
 
     private static final long serialVersionUID = 1;
     /**
@@ -25,6 +25,7 @@ public final class Complex{{ E }} implements Imaginary{{ E }}, Comparable<Comple
      * An immutable identity (1, 0) complex.
      */
     public static final Complex{{ E }} IDENTITY = new Complex{{ E }}(1, 0);
+
     private final {{ e }} x;
     private final {{ e }} y;
     @SuppressWarnings("Immutable")
@@ -32,13 +33,6 @@ public final class Complex{{ E }} implements Imaginary{{ E }}, Comparable<Comple
     @SuppressWarnings("Immutable")
     private transient volatile int hashCode = 0;
 
-    /**
-     * Constructs a new complex. The components are set to the identity (1, 0).
-     */
-    public Complex{{ E }}() {
-        this(1, 0);
-    }
-
     /**
      * Constructs a new complex from the {{ EOverload }} components.
      *
@@ -60,16 +54,6 @@ public final class Complex{{ E }} implements Imaginary{{ E }}, Comparable<Comple
         this.y = y;
     }
 
-    /**
-     * Copy constructor.
-     *
-     * @param c The complex to copy
-     */
-    public Complex{{ E }}(final Complex{{ E }} c) {
-        this.x = c.x;
-        this.y = c.y;
-    }
-
     /**
      * Gets the x (real) component of this complex.
      *
@@ -513,11 +497,6 @@ public final class Complex{{ E }} implements Imaginary{{ E }}, Comparable<Comple
         return (int) Math.signum(this.lengthSquared() - that.lengthSquared());
     }
 
-    @Override
-    public Complex{{ E }} clone() {
-        return new Complex{{ E }}(this);
-    }
-
     @Override
     public String toString() {
         return "(" + this.x + ", " + this.y + ")";
diff --git a/src/main/template/float/org/spongepowered/math/imaginary/Quaternion{{E}}.java.peb b/src/main/template/float/org/spongepowered/math/imaginary/Quaternion{{E}}.java.peb
index 6fe5d13..8bea1e8 100644
--- a/src/main/template/float/org/spongepowered/math/imaginary/Quaternion{{E}}.java.peb
+++ b/src/main/template/float/org/spongepowered/math/imaginary/Quaternion{{E}}.java.peb
@@ -15,7 +15,7 @@ import org.spongepowered.math.vector.Vector3{{ E }};
  * immutable.</p>
  */
 @Immutable
-public final class Quaternion{{ E }} implements Imaginary{{ E }}, Comparable<Quaternion{{ E }}>, Serializable, Cloneable {
+public final class Quaternion{{ E }} implements Imaginary{{ E }}, Comparable<Quaternion{{ E }}>, Serializable {
 
     private static final long serialVersionUID = 1;
     /**
@@ -35,13 +35,6 @@ public final class Quaternion{{ E }} implements Imaginary{{ E }}, Comparable<Qua
     @SuppressWarnings("Immutable")
     private transient volatile int hashCode = 0;
 
-    /**
-     * Constructs a new quaternion. The components are set to the identity (0, 0, 0, 1).
-     */
-    public Quaternion{{ E }}() {
-        this(0, 0, 0, 1);
-    }
-
     /**
      * Constructs a new quaternion from the {{ EOverload }} components.
      *
@@ -69,15 +62,6 @@ public final class Quaternion{{ E }} implements Imaginary{{ E }}, Comparable<Qua
         this.w = w;
     }
 
-    /**
-     * Copy constructor.
-     *
-     * @param q The quaternion to copy
-     */
-    public Quaternion{{ E }}(final Quaternion{{ E }} q) {
-        this(q.x, q.y, q.z, q.w);
-    }
-
     /**
      * Gets the x (imaginary) component of this quaternion.
      *
@@ -579,11 +563,6 @@ public final class Quaternion{{ E }} implements Imaginary{{ E }}, Comparable<Qua
         return (int) Math.signum(this.lengthSquared() - q.lengthSquared());
     }
 
-    @Override
-    public Quaternion{{ E }} clone() {
-        return new Quaternion{{ E }}(this);
-    }
-
     @Override
     public String toString() {
         return "(" + this.x + ", " + this.y + ", " + this.z + ", " + this.w + ")";
diff --git a/src/main/template/float/org/spongepowered/math/matrix/Matrix2{{E}}.java.peb b/src/main/template/float/org/spongepowered/math/matrix/Matrix2{{E}}.java.peb
index 1ac9c6b..c739e7a 100644
--- a/src/main/template/float/org/spongepowered/math/matrix/Matrix2{{E}}.java.peb
+++ b/src/main/template/float/org/spongepowered/math/matrix/Matrix2{{E}}.java.peb
@@ -13,13 +13,17 @@ import org.spongepowered.math.vector.Vector2{{ E }};
 * A 2x2 matrix containing values of type {@code {{ e }}}.`
 */
 @Immutable
-public final class Matrix2{{ E }} implements Matrix{{ E }}, Serializable, Cloneable {
+public final class Matrix2{{ E }} implements Matrix{{ E }}, Serializable {
 
     private static final long serialVersionUID = 1;
     public static final Matrix2{{ E }} ZERO = new Matrix2{{ E }}(
-            0, 0,
-            0, 0);
-    public static final Matrix2{{ E }} IDENTITY = new Matrix2{{ E }}();
+        0, 0,
+        0, 0
+    );
+    public static final Matrix2{{ E }} IDENTITY = new Matrix2{{ E }}(
+        1, 0,
+        0, 1
+    );
     private final {{ e }} m00, m01;
     private final {{ e }} m10, m11;
     @SuppressWarnings("Immutable")
@@ -27,18 +31,6 @@ public final class Matrix2{{ E }} implements Matrix{{ E }}, Serializable, Clonea
     @SuppressWarnings("Immutable")
     private transient volatile int hashCode = 0;
 
-    public Matrix2{{ E }}() {
-        this(
-                1, 0,
-                0, 1);
-    }
-
-    public Matrix2{{ E }}(final Matrix2{{ E }} m) {
-        this(
-                m.m00, m.m01,
-                m.m10, m.m11);
-    }
-
     public Matrix2{{ E }}(final Matrix3{{ E }} m) {
         this(
                 m.get(0, 0), m.get(0, 1),
@@ -370,11 +362,6 @@ public final class Matrix2{{ E }} implements Matrix{{ E }}, Serializable, Clonea
         return this.hashCode;
     }
 
-    @Override
-    public Matrix2{{ E }} clone() {
-        return new Matrix2{{ E }}(this);
-    }
-
     public static Matrix2{{ E }} from(final {{ e }} n) {
          return n == 0 ? Matrix2{{ E}}.ZERO : new Matrix2{{ E }}(n, n, n, n);
     }
diff --git a/src/main/template/float/org/spongepowered/math/matrix/Matrix3{{E}}.java.peb b/src/main/template/float/org/spongepowered/math/matrix/Matrix3{{E}}.java.peb
index d028e5b..033470d 100644
--- a/src/main/template/float/org/spongepowered/math/matrix/Matrix3{{E}}.java.peb
+++ b/src/main/template/float/org/spongepowered/math/matrix/Matrix3{{E}}.java.peb
@@ -10,7 +10,7 @@ import org.spongepowered.math.vector.Vector2{{ E }};
 import org.spongepowered.math.vector.Vector3{{ E }};
 
 @Immutable
-public final class Matrix3{{ E }} implements Matrix{{ E }}, Serializable, Cloneable {
+public final class Matrix3{{ E }} implements Matrix{{ E }}, Serializable {
 
     private static final long serialVersionUID = 1;
     public static final Matrix3{{ E }} ZERO = new Matrix3{{ E }}(
@@ -18,7 +18,11 @@ public final class Matrix3{{ E }} implements Matrix{{ E }}, Serializable, Clonea
         0, 0, 0,
         0, 0, 0
     );
-    public static final Matrix3{{ E }} IDENTITY = new Matrix3{{ E }}();
+    public static final Matrix3{{ E }} IDENTITY = new Matrix3{{ E }}(
+        1, 0, 0,
+        0, 1, 0,
+        0, 0, 1
+    );
     private final {{ e }} m00, m01, m02;
     private final {{ e }} m10, m11, m12;
     private final {{ e }} m20, m21, m22;
@@ -27,14 +31,6 @@ public final class Matrix3{{ E }} implements Matrix{{ E }}, Serializable, Clonea
     @SuppressWarnings("Immutable")
     private transient volatile int hashCode = 0;
 
-    public Matrix3{{ E }}() {
-        this(
-            1, 0, 0,
-            0, 1, 0,
-            0, 0, 1
-        );
-    }
-
     public Matrix3{{ E }}(final Matrix2{{ E }} m) {
         this(
             m.get(0, 0), m.get(0, 1), 0,
@@ -43,14 +39,6 @@ public final class Matrix3{{ E }} implements Matrix{{ E }}, Serializable, Clonea
         );
     }
 
-    public Matrix3{{ E }}(final Matrix3{{ E }} m) {
-        this(
-            m.m00, m.m01, m.m02,
-            m.m10, m.m11, m.m12,
-            m.m20, m.m21, m.m22
-        );
-    }
-
     public Matrix3{{ E }}(final Matrix4{{ E }} m) {
         this(
             m.get(0, 0), m.get(0, 1), m.get(0, 2),
@@ -474,11 +462,6 @@ public final class Matrix3{{ E }} implements Matrix{{ E }}, Serializable, Clonea
         return this.hashCode;
     }
 
-    @Override
-    public Matrix3{{ E }} clone() {
-        return new Matrix3{{ E }}(this);
-    }
-
     public static Matrix3{{ E }} from(final {{ e }} n) {
          return n == 0 ? Matrix3{{ E }}.ZERO : new Matrix3{{ E }}(n, n, n, n, n, n, n, n, n);
     }
diff --git a/src/main/template/float/org/spongepowered/math/matrix/Matrix4{{E}}.java.peb b/src/main/template/float/org/spongepowered/math/matrix/Matrix4{{E}}.java.peb
index 0b30d29..061c1ca 100644
--- a/src/main/template/float/org/spongepowered/math/matrix/Matrix4{{E}}.java.peb
+++ b/src/main/template/float/org/spongepowered/math/matrix/Matrix4{{E}}.java.peb
@@ -12,7 +12,7 @@ import org.spongepowered.math.vector.Vector3{{ E }};
 import org.spongepowered.math.vector.Vector4{{ E }};
 
 @Immutable
-public final class Matrix4{{ E }} implements Matrix{{ E }}, Serializable, Cloneable {
+public final class Matrix4{{ E }} implements Matrix{{ E }}, Serializable {
 
     private static final long serialVersionUID = 1;
     public static final Matrix4{{ E }} ZERO = new Matrix4{{ E }}(
@@ -21,7 +21,12 @@ public final class Matrix4{{ E }} implements Matrix{{ E }}, Serializable, Clonea
         0, 0, 0, 0,
         0, 0, 0, 0
     );
-    public static final Matrix4{{ E }} IDENTITY = new Matrix4{{ E }}();
+    public static final Matrix4{{ E }} IDENTITY = new Matrix4{{ E }}(
+        1, 0, 0, 0,
+        0, 1, 0, 0,
+        0, 0, 1, 0,
+        0, 0, 0, 1
+    );
     private final {{ e }} m00, m01, m02, m03;
     private final {{ e }} m10, m11, m12, m13;
     private final {{ e }} m20, m21, m22, m23;
@@ -31,14 +36,6 @@ public final class Matrix4{{ E }} implements Matrix{{ E }}, Serializable, Clonea
     @SuppressWarnings("Immutable")
     private transient volatile int hashCode = 0;
 
-    public Matrix4{{ E }}() {
-        this(
-                1, 0, 0, 0,
-                0, 1, 0, 0,
-                0, 0, 1, 0,
-                0, 0, 0, 1);
-    }
-
     public Matrix4{{ E }}(final Matrix2{{ E }} m) {
         this(
                 m.get(0, 0), m.get(0, 1), 0, 0,
@@ -55,14 +52,6 @@ public final class Matrix4{{ E }} implements Matrix{{ E }}, Serializable, Clonea
                 0, 0, 0, 0);
     }
 
-    public Matrix4{{ E }}(final Matrix4{{ E }} m) {
-        this(
-                m.m00, m.m01, m.m02, m.m03,
-                m.m10, m.m11, m.m12, m.m13,
-                m.m20, m.m21, m.m22, m.m23,
-                m.m30, m.m31, m.m32, m.m33);
-    }
-
     public Matrix4{{ E }}(final MatrixN{{ E }} m) {
         this.m00 = m.get(0, 0);
         this.m01 = m.get(0, 1);
@@ -599,11 +588,6 @@ public final class Matrix4{{ E }} implements Matrix{{ E }}, Serializable, Clonea
         return this.hashCode;
     }
 
-    @Override
-    public Matrix4{{ E }} clone() {
-        return new Matrix4{{ E }}(this);
-    }
-
     public static Matrix4{{ E }} from(final {{ e }} n) {
          return n == 0 ? Matrix4{{ E }}.ZERO : new Matrix4{{ E }}(n, n, n, n, n, n, n, n, n, n, n, n, n, n, n, n);
     }
diff --git a/src/main/template/float/org/spongepowered/math/vector/Vector2{{E}}.java.peb b/src/main/template/float/org/spongepowered/math/vector/Vector2{{E}}.java.peb
index b10aaa4..2432420 100644
--- a/src/main/template/float/org/spongepowered/math/vector/Vector2{{E}}.java.peb
+++ b/src/main/template/float/org/spongepowered/math/vector/Vector2{{E}}.java.peb
@@ -10,7 +10,7 @@ import org.spongepowered.math.HashFunctions;
 import org.spongepowered.math.TrigMath;
 
 @Immutable
-public final class Vector2{{ E }} implements Vector{{ E }}, Comparable<Vector2{{ E }}>, Serializable, Cloneable {
+public final class Vector2{{ E }} implements Vector{{ E }}, Comparable<Vector2{{ E }}>, Serializable {
 
     private static final long serialVersionUID = 1;
     public static final Vector2{{ E }} ZERO = new Vector2{{ E }}(0, 0);
@@ -24,14 +24,6 @@ public final class Vector2{{ E }} implements Vector{{ E }}, Comparable<Vector2{{
     @SuppressWarnings("Immutable")
     private transient volatile int hashCode = 0;
 
-    public Vector2{{ E }}() {
-        this(0, 0);
-    }
-
-    public Vector2{{ E }}(final Vector2{{ E }} v) {
-        this(v.x, v.y);
-    }
-
     public Vector2{{ E }}(final Vector3{{ E }} v) {
         this(v.x(), v.y());
     }
@@ -373,11 +365,6 @@ public final class Vector2{{ E }} implements Vector{{ E }}, Comparable<Vector2{{
         return this.hashCode;
     }
 
-    @Override
-    public Vector2{{ E }} clone() {
-        return new Vector2{{ E }}(this);
-    }
-
     @Override
     public String toString() {
         return "(" + this.x + ", " + this.y + ")";
diff --git a/src/main/template/float/org/spongepowered/math/vector/Vector3{{E}}.java.peb b/src/main/template/float/org/spongepowered/math/vector/Vector3{{E}}.java.peb
index 3381da0..f46aefb 100644
--- a/src/main/template/float/org/spongepowered/math/vector/Vector3{{E}}.java.peb
+++ b/src/main/template/float/org/spongepowered/math/vector/Vector3{{E}}.java.peb
@@ -9,7 +9,7 @@ import org.spongepowered.math.HashFunctions;
 import org.spongepowered.math.TrigMath;
 
 @Immutable
-public final class Vector3{{ E }} implements Vector{{ E }}, Comparable<Vector3{{ E }}>, Serializable, Cloneable {
+public final class Vector3{{ E }} implements Vector{{ E }}, Comparable<Vector3{{ E }}>, Serializable {
 
     private static final long serialVersionUID = 1;
     public static final Vector3{{ E }} ZERO = new Vector3{{ E }}(0, 0, 0);
@@ -28,10 +28,6 @@ public final class Vector3{{ E }} implements Vector{{ E }}, Comparable<Vector3{{
     @SuppressWarnings("Immutable")
     private transient volatile int hashCode = 0;
 
-    public Vector3{{ E }}() {
-        this(0, 0, 0);
-    }
-
     public Vector3{{ E }}(final Vector2{{ E }} v) {
         this(v, 0);
     }
@@ -44,10 +40,6 @@ public final class Vector3{{ E }} implements Vector{{ E }}, Comparable<Vector3{{
         this(v.x(), v.y(), z);
     }
 
-    public Vector3{{ E }}(final Vector3{{ E }} v) {
-        this(v.x, v.y, v.z);
-    }
-
     public Vector3{{ E }}(final Vector4{{ E }} v) {
         this(v.x(), v.y(), v.z());
     }
@@ -407,11 +399,6 @@ public final class Vector3{{ E }} implements Vector{{ E }}, Comparable<Vector3{{
         return this.hashCode;
     }
 
-    @Override
-    public Vector3{{ E }} clone() {
-        return new Vector3{{ E }}(this);
-    }
-
     @Override
     public String toString() {
         return "(" + this.x + ", " + this.y + ", " + this.z + ")";
diff --git a/src/main/template/float/org/spongepowered/math/vector/Vector4{{E}}.java.peb b/src/main/template/float/org/spongepowered/math/vector/Vector4{{E}}.java.peb
index b291626..616a405 100644
--- a/src/main/template/float/org/spongepowered/math/vector/Vector4{{E}}.java.peb
+++ b/src/main/template/float/org/spongepowered/math/vector/Vector4{{E}}.java.peb
@@ -7,7 +7,7 @@ import org.spongepowered.math.GenericMath;
 import org.spongepowered.math.HashFunctions;
 
 @Immutable
-public final class Vector4{{ E }} implements Vector{{ E }}, Comparable<Vector4{{ E }}>, Serializable, Cloneable {
+public final class Vector4{{ E }} implements Vector{{ E }}, Comparable<Vector4{{ E }}>, Serializable {
 
     private static final long serialVersionUID = 1;
     public static final Vector4{{ E }} ZERO = new Vector4{{ E }}(0, 0, 0, 0);
@@ -25,10 +25,6 @@ public final class Vector4{{ E }} implements Vector{{ E }}, Comparable<Vector4{{
     @SuppressWarnings("Immutable")
     private transient volatile int hashCode = 0;
 
-    public Vector4{{ E }}() {
-        this(0, 0, 0, 0);
-    }
-
     public Vector4{{ E }}(final Vector2{{ E }} v) {
         this(v, 0, 0);
     }
@@ -53,10 +49,6 @@ public final class Vector4{{ E }} implements Vector{{ E }}, Comparable<Vector4{{
         this(v.x(), v.y(), v.z(), w);
     }
 
-    public Vector4{{ E }}(final Vector4{{ E }} v) {
-        this(v.x, v.y, v.z, v.w);
-    }
-
     public Vector4{{ E }}(final VectorN{{ E }} v) {
         this(v.get(0), v.get(1), v.size() > 2 ? v.get(2) : 0, v.size() > 3 ? v.get(3) : 0);
     }
@@ -428,11 +420,6 @@ public final class Vector4{{ E }} implements Vector{{ E }}, Comparable<Vector4{{
         return this.hashCode;
     }
 
-    @Override
-    public Vector4{{ E }} clone() {
-        return new Vector4{{ E }}(this);
-    }
-
     @Override
     public String toString() {
         return "(" + this.x + ", " + this.y + ", " + this.z + ", " + this.w + ")";
diff --git a/src/main/template/integer/org/spongepowered/math/vector/Vector2{{E}}.java.peb b/src/main/template/integer/org/spongepowered/math/vector/Vector2{{E}}.java.peb
index a5d15c3..c6a7ecc 100644
--- a/src/main/template/integer/org/spongepowered/math/vector/Vector2{{E}}.java.peb
+++ b/src/main/template/integer/org/spongepowered/math/vector/Vector2{{E}}.java.peb
@@ -6,7 +6,7 @@ import com.google.errorprone.annotations.Immutable;
 import org.spongepowered.math.GenericMath;
 
 @Immutable
-public final class Vector2{{ E }} implements Vector{{ E }}, Comparable<Vector2{{ E }}>, Serializable, Cloneable {
+public final class Vector2{{ E }} implements Vector{{ E }}, Comparable<Vector2{{ E }}>, Serializable {
 
     private static final long serialVersionUID = 1;
     public static final Vector2{{ E }} ZERO = new Vector2{{ E }}(0, 0);
@@ -20,14 +20,6 @@ public final class Vector2{{ E }} implements Vector{{ E }}, Comparable<Vector2{{
     @SuppressWarnings("Immutable")
     private transient volatile int hashCode = 0;
 
-    public Vector2{{ E }}() {
-        this(0, 0);
-    }
-
-    public Vector2{{ E }}(final Vector2{{ E }} v) {
-        this(v.x, v.y);
-    }
-
     public Vector2{{ E }}(final Vector3{{ E }} v) {
         this(v.x(), v.y());
     }
@@ -337,11 +329,6 @@ public final class Vector2{{ E }} implements Vector{{ E }}, Comparable<Vector2{{
         return this.hashCode;
     }
 
-    @Override
-    public Vector2{{ E }} clone() {
-        return new Vector2{{ E }}(this);
-    }
-
     @Override
     public String toString() {
         return "(" + this.x + ", " + this.y + ")";
diff --git a/src/main/template/integer/org/spongepowered/math/vector/Vector3{{E}}.java.peb b/src/main/template/integer/org/spongepowered/math/vector/Vector3{{E}}.java.peb
index f513466..9c2c975 100644
--- a/src/main/template/integer/org/spongepowered/math/vector/Vector3{{E}}.java.peb
+++ b/src/main/template/integer/org/spongepowered/math/vector/Vector3{{E}}.java.peb
@@ -8,7 +8,7 @@ import com.google.errorprone.annotations.Immutable;
 import org.spongepowered.math.GenericMath;
 
 @Immutable
-public final class Vector3{{ E }} implements Vector{{ E }}, Comparable<Vector3{{ E }}>, Serializable, Cloneable {
+public final class Vector3{{ E }} implements Vector{{ E }}, Comparable<Vector3{{ E }}>, Serializable {
 
     private static final long serialVersionUID = 1;
     public static final Vector3{{ E }} ZERO = new Vector3{{ E }}(0, 0, 0);
@@ -27,10 +27,6 @@ public final class Vector3{{ E }} implements Vector{{ E }}, Comparable<Vector3{{
     @SuppressWarnings("Immutable")
     private transient volatile int hashCode = 0;
 
-    public Vector3{{ E }}() {
-        this(0, 0, 0);
-    }
-
     public Vector3{{ E }}(final Vector2{{ E }} v) {
         this(v, 0);
     }
@@ -43,10 +39,6 @@ public final class Vector3{{ E }} implements Vector{{ E }}, Comparable<Vector3{{
         this(v.x(), v.y(), z);
     }
 
-    public Vector3{{ E }}(final Vector3{{ E }} v) {
-        this(v.x, v.y, v.z);
-    }
-
     public Vector3{{ E }}(final Vector4{{ E }} v) {
         this(v.x(), v.y(), v.z());
     }
@@ -368,11 +360,6 @@ public final class Vector3{{ E }} implements Vector{{ E }}, Comparable<Vector3{{
         return this.hashCode;
     }
 
-    @Override
-    public Vector3{{ E }} clone() {
-        return new Vector3{{ E }}(this);
-    }
-
     @Override
     public String toString() {
         return "(" + this.x + ", " + this.y + ", " + this.z + ")";
diff --git a/src/main/template/integer/org/spongepowered/math/vector/Vector4{{E}}.java.peb b/src/main/template/integer/org/spongepowered/math/vector/Vector4{{E}}.java.peb
index 1fb600d..927df0a 100644
--- a/src/main/template/integer/org/spongepowered/math/vector/Vector4{{E}}.java.peb
+++ b/src/main/template/integer/org/spongepowered/math/vector/Vector4{{E}}.java.peb
@@ -6,7 +6,7 @@ import com.google.errorprone.annotations.Immutable;
 import org.spongepowered.math.GenericMath;
 
 @Immutable
-public final class Vector4{{ E }} implements Vector{{ E }}, Comparable<Vector4{{ E }}>, Serializable, Cloneable {
+public final class Vector4{{ E }} implements Vector{{ E }}, Comparable<Vector4{{ E }}>, Serializable {
 
     private static final long serialVersionUID = 1;
     public static final Vector4{{ E }} ZERO = new Vector4{{ E }}(0, 0, 0, 0);
@@ -24,10 +24,6 @@ public final class Vector4{{ E }} implements Vector{{ E }}, Comparable<Vector4{{
     @SuppressWarnings("Immutable")
     private transient volatile int hashCode = 0;
 
-    public Vector4{{ E }}() {
-        this(0, 0, 0, 0);
-    }
-
     public Vector4{{ E }}(final Vector2{{ E }} v) {
         this(v, 0, 0);
     }
@@ -52,10 +48,6 @@ public final class Vector4{{ E }} implements Vector{{ E }}, Comparable<Vector4{{
         this(v.x(), v.y(), v.z(), w);
     }
 
-    public Vector4{{ E }}(final Vector4{{ E }} v) {
-        this(v.x, v.y, v.z, v.w);
-    }
-
     public Vector4{{ E }}(final VectorN{{ E }} v) {
         this(v.get(0), v.get(1), v.size() > 2 ? v.get(2) : 0, v.size() > 3 ? v.get(3) : 0);
     }
@@ -388,11 +380,6 @@ public final class Vector4{{ E }} implements Vector{{ E }}, Comparable<Vector4{{
         return this.hashCode;
     }
 
-    @Override
-    public Vector4{{ E }} clone() {
-        return new Vector4{{ E }}(this);
-    }
-
     @Override
     public String toString() {
         return "(" + this.x + ", " + this.y + ", " + this.z + ", " + this.w + ")";
diff --git a/src/test/template/float/com/flowpowered/math/test/imaginary/Complex{{E}}Test.java.peb b/src/test/template/float/com/flowpowered/math/test/imaginary/Complex{{E}}Test.java.peb
index 205a052..3bd41ef 100644
--- a/src/test/template/float/com/flowpowered/math/test/imaginary/Complex{{E}}Test.java.peb
+++ b/src/test/template/float/com/flowpowered/math/test/imaginary/Complex{{E}}Test.java.peb
@@ -13,8 +13,8 @@ import org.spongepowered.math.vector.Vector3{{ E }};
 public class Complex{{ E }}Test {
 
     @Test
-    void testDefaultConstructor() {
-        final Complex{{ E }} complex = new Complex{{ E }}();
+    void testIdentity() {
+        final Complex{{ E }} complex = Complex{{ E }}.IDENTITY;
         TestUtil{{ E }}.assertEquals(complex, 1, 0);
     }
 
@@ -30,12 +30,6 @@ public class Complex{{ E }}Test {
         TestUtil{{ E }}.assertEquals(complex, 2, 3);
     }
 
-    @Test
-    void testCopyConstructor() {
-        final Complex{{ E }} complex = new Complex{{ E }}(new Complex{{ E }}(2, 3));
-        TestUtil{{ E }}.assertEquals(complex, 2, 3);
-    }
-
     @Test
     void testGetters() {
         final Complex{{ E }} complex = new Complex{{ E }}(2, 3);
@@ -292,12 +286,6 @@ public class Complex{{ E }}Test {
         Assertions.assertTrue(c4 > 0);
     }
 
-    @Test
-    void testCloning() {
-        final Complex{{ E }} complex = new Complex{{ E }}(3, 2);
-        Assertions.assertEquals(complex, complex.clone());
-    }
-
     @Test
     void testComplexFromReal() {
         final Complex{{ E }} complex = Complex{{ E }}.fromReal(1);
diff --git a/src/test/template/float/com/flowpowered/math/test/imaginary/Quaternion{{E}}Test.java.peb b/src/test/template/float/com/flowpowered/math/test/imaginary/Quaternion{{E}}Test.java.peb
index 3d72b13..54b7542 100644
--- a/src/test/template/float/com/flowpowered/math/test/imaginary/Quaternion{{E}}Test.java.peb
+++ b/src/test/template/float/com/flowpowered/math/test/imaginary/Quaternion{{E}}Test.java.peb
@@ -14,8 +14,8 @@ import static org.spongepowered.math.test.TestUtil{{ E }}.SQRT54;
 
 public class Quaternion{{ E }}Test {
     @Test
-    void testDefaultConstructor() {
-        final Quaternion{{ E }} quaternion = new Quaternion{{ E }}();
+    void testIdentity() {
+        final Quaternion{{ E }} quaternion = Quaternion{{ E }}.IDENTITY;
         TestUtil{{ E }}.assertEquals(quaternion, 0, 0, 0, 1);
     }
 
@@ -31,12 +31,6 @@ public class Quaternion{{ E }}Test {
         TestUtil{{ E }}.assertEquals(quaternion, 1, 2, 3, 4);
     }
 
-    @Test
-    void testCopyConstructor() {
-        final Quaternion{{ E }} quaternion = new Quaternion{{ E }}(new Quaternion{{ E }}(1, 2, 3, 4));
-        TestUtil{{ E }}.assertEquals(quaternion, 1, 2, 3, 4);
-    }
-
     @Test
     void testGetters() {
         final Quaternion{{ E }} quaternion = new Quaternion{{ E }}(1, 2, 3, 4);
@@ -295,12 +289,6 @@ public class Quaternion{{ E }}Test {
         Assertions.assertTrue(c4 > 0);
     }
 
-    @Test
-    void testCloning() {
-        final Quaternion{{ E }} quaternion = new Quaternion{{ E }}(3, 2, 5, 6);
-        Assertions.assertEquals(quaternion, quaternion.clone());
-    }
-
     @Test
     void testQuaternionFromReal() {
         final Quaternion{{ E }} quaternion = Quaternion{{ E }}.fromReal(1);
diff --git a/src/test/template/float/com/flowpowered/math/test/matrix/Matrix2{{E}}Test.java.peb b/src/test/template/float/com/flowpowered/math/test/matrix/Matrix2{{E}}Test.java.peb
index 7434209..68d094f 100644
--- a/src/test/template/float/com/flowpowered/math/test/matrix/Matrix2{{E}}Test.java.peb
+++ b/src/test/template/float/com/flowpowered/math/test/matrix/Matrix2{{E}}Test.java.peb
@@ -15,17 +15,11 @@ import static org.spongepowered.math.test.TestUtil{{ E }}.SQRT13;
 public class Matrix2{{ E }}Test {
 
     @Test
-    void testDefaultConstructor() {
-        final Matrix2{{ E }} matrix = new Matrix2{{ E }}();
+    void testIdentity() {
+        final Matrix2{{ E }} matrix = Matrix2{{ E }}.IDENTITY;
         TestUtil{{ E }}.assertEquals(matrix, 1, 0, 0, 1);
     }
 
-    @Test
-    void testCopyMatrix2Constructor() {
-        final Matrix2{{ E }} matrix = new Matrix2{{ E }}(new Matrix2{{ E }}(1, 2, 3, 4));
-        TestUtil{{ E }}.assertEquals(matrix, 1, 2, 3, 4);
-    }
-
     @Test
     void testCopyMatrix3Constructor() {
         final Matrix2{{ E }} matrix = new Matrix2{{ E }}(new Matrix3{{ E }}(1, 2, 3, 4, 5, 6, 7, 8, 9));
@@ -296,12 +290,6 @@ public class Matrix2{{ E }}Test {
         Assertions.assertFalse(new Matrix2{{ E }}(1, 2, 3, 4).equals(new Matrix2{{ E }}(1, 2, 3, 5)));
     }
 
-    @Test
-    void testCloning() {
-        final Matrix2{{ E }} matrix = new Matrix2{{ E }}(1, 2, 3, 4);
-        Assertions.assertEquals(matrix, matrix.clone());
-    }
-
     @Test
     void testMatrixFromN() {
         final Matrix2{{ E }} matrix = Matrix2{{ E }}.from(1);
diff --git a/src/test/template/float/com/flowpowered/math/test/matrix/Matrix3{{E}}Test.java.peb b/src/test/template/float/com/flowpowered/math/test/matrix/Matrix3{{E}}Test.java.peb
index e888cc0..d8b6a8b 100644
--- a/src/test/template/float/com/flowpowered/math/test/matrix/Matrix3{{E}}Test.java.peb
+++ b/src/test/template/float/com/flowpowered/math/test/matrix/Matrix3{{E}}Test.java.peb
@@ -17,8 +17,8 @@ import static org.spongepowered.math.test.TestUtil{{ E }}.SQRT13;
 public class Matrix3{{ E }}Test {
 
     @Test
-    void testDefaultConstructor() {
-        final Matrix3{{ E }} matrix = new Matrix3{{ E }}();
+    void testIdentity() {
+        final Matrix3{{ E }} matrix = Matrix3{{ E }}.IDENTITY;
         TestUtil{{ E }}.assertEquals(matrix, 1, 0, 0, 0, 1, 0, 0, 0, 1);
     }
 
@@ -28,12 +28,6 @@ public class Matrix3{{ E }}Test {
         TestUtil{{ E }}.assertEquals(matrix, 1, 2, 0, 3, 4, 0, 0, 0, 0);
     }
 
-    @Test
-    void testCopyMatrix3Constructor() {
-        final Matrix3{{ E }} matrix = new Matrix3{{ E }}(new Matrix3{{ E }}(1, 2, 3, 4, 5, 6, 7, 8, 9));
-        TestUtil{{ E }}.assertEquals(matrix, 1, 2, 3, 4, 5, 6, 7, 8, 9);
-    }
-
     @Test
     void testCopyMatrix4Constructor() {
         final Matrix3{{ E }} matrix = new Matrix3{{ E }}(new Matrix4{{ E }}(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16));
@@ -334,12 +328,6 @@ public class Matrix3{{ E }}Test {
         Assertions.assertNotEquals(new Matrix3{{ E }}(1, 2, 3, 4, 5, 6, 7, 8, 9), new Matrix3{{ E }}(1, 2, 3, 4, 5, 6, 7, 8, 0));
     }
 
-    @Test
-    void testCloning() {
-        final Matrix3{{ E }} matrix = new Matrix3{{ E }}(1, 2, 3, 4, 5, 6, 7, 8, 9);
-        Assertions.assertEquals(matrix, matrix.clone());
-    }
-
     @Test
     void testMatrixFromN() {
         final Matrix3{{ E }} matrix = Matrix3{{ E }}.from(1);
diff --git a/src/test/template/float/com/flowpowered/math/test/matrix/Matrix4{{E}}Test.java.peb b/src/test/template/float/com/flowpowered/math/test/matrix/Matrix4{{E}}Test.java.peb
index e469428..41745da 100644
--- a/src/test/template/float/com/flowpowered/math/test/matrix/Matrix4{{E}}Test.java.peb
+++ b/src/test/template/float/com/flowpowered/math/test/matrix/Matrix4{{E}}Test.java.peb
@@ -16,8 +16,8 @@ import static org.spongepowered.math.test.TestUtil{{ E }}.SQRT13;
 
 public class Matrix4{{ E }}Test {
     @Test
-    void testDefaultConstructor() {
-        final Matrix4{{ E }} matrix = new Matrix4{{ E }}();
+    void testIdentity() {
+        final Matrix4{{ E }} matrix = Matrix4{{ E }}.IDENTITY;
         TestUtil{{ E }}.assertEquals(matrix,
                 1, 0, 0, 0,
                 0, 1, 0, 0,
@@ -45,20 +45,6 @@ public class Matrix4{{ E }}Test {
                 0, 0, 0, 0);
     }
 
-    @Test
-    void testCopyMatrix4Constructor() {
-        final Matrix4{{ E }} matrix = new Matrix4{{ E }}(new Matrix4{{ E }}(
-                1, 2, 3, 4,
-                5, 6, 7, 8,
-                9, 10, 11, 12,
-                13, 14, 15, 16));
-        TestUtil{{ E }}.assertEquals(matrix,
-                1, 2, 3, 4,
-                5, 6, 7, 8,
-                9, 10, 11, 12,
-                13, 14, 15, 16);
-    }
-
     @Test
     void testCopyMatrixNConstructor() {
         final Matrix4{{ E }} matrix = new Matrix4{{ E }}(new MatrixN{{ E }}(
@@ -743,16 +729,6 @@ public class Matrix4{{ E }}Test {
         Assertions.assertNotEquals(matrix11, matrix12);
     }
 
-    @Test
-    void testCloning() {
-        final Matrix4{{ E }} matrix = new Matrix4{{ E }}(
-                1, 2, 3, 4,
-                0, 2, 0, 0,
-                0, 0, 3, 0,
-                0, 0, 0, 4);
-        Assertions.assertEquals(matrix, matrix.clone());
-    }
-
     @Test
     void testMatrixFromN() {
         final Matrix4{{ E }} matrix = Matrix4{{ E }}.from(1);
diff --git a/src/test/template/float/com/flowpowered/math/test/vector/Vector2{{E}}Test.java.peb b/src/test/template/float/com/flowpowered/math/test/vector/Vector2{{E}}Test.java.peb
index 917c75a..cd30437 100644
--- a/src/test/template/float/com/flowpowered/math/test/vector/Vector2{{E}}Test.java.peb
+++ b/src/test/template/float/com/flowpowered/math/test/vector/Vector2{{E}}Test.java.peb
@@ -15,17 +15,11 @@ import org.spongepowered.math.vector.VectorN{{ E }};
 public class Vector2{{ E }}Test {
 
     @Test
-    void testEmptyConstructor() {
-        final Vector2{{ E }} vector = new Vector2{{ E }}();
+    void testZero() {
+        final Vector2{{ E }} vector = Vector2{{ E }}.ZERO;
         TestUtil{{ E }}.assertEquals(vector, 0, 0);
     }
 
-    @Test
-    void testCopyVector2Constructor() {
-        final Vector2{{ E }} vector = new Vector2{{ E }}(new Vector2{{ E }}(0, 1));
-        TestUtil{{ E }}.assertEquals(vector, 0, 1);
-    }
-
     @Test
     void testCopyVector3Constructor() {
         final Vector2{{ E }} vector = new Vector2{{ E }}(new Vector3{{ E }}(0, 1, 2));
@@ -419,12 +413,6 @@ public class Vector2{{ E }}Test {
         Assertions.assertFalse(new Vector2{{ E }}(122, 43).equals(new Vector2{{ E }}(378, 95)));
     }
 
-    @Test
-    void testCloning() {
-        final Vector2{{ E }} vector = new Vector2{{ E }}(3, 2);
-        Assertions.assertEquals(vector, vector.clone());
-    }
-
     @Test
     void testVectorFromN() {
         final Vector2{{ E }} vector = Vector2{{ E }}.from(1);
diff --git a/src/test/template/float/com/flowpowered/math/test/vector/Vector3{{E}}Test.java.peb b/src/test/template/float/com/flowpowered/math/test/vector/Vector3{{E}}Test.java.peb
index 343af1d..ea3ac6d 100644
--- a/src/test/template/float/com/flowpowered/math/test/vector/Vector3{{E}}Test.java.peb
+++ b/src/test/template/float/com/flowpowered/math/test/vector/Vector3{{E}}Test.java.peb
@@ -16,8 +16,8 @@ import org.spongepowered.math.vector.VectorN{{ E }};
 
 public class Vector3{{ E }}Test {
     @Test
-    void testEmptyConstructor() {
-        final Vector3{{ E }} vector = new Vector3{{ E }}();
+    void testZero() {
+        final Vector3{{ E }} vector = Vector3{{ E }}.ZERO;
         TestUtil{{ E }}.assertEquals(vector, 0, 0, 0);
     }
 
@@ -39,12 +39,6 @@ public class Vector3{{ E }}Test {
         TestUtil{{ E }}.assertEquals(vector, 0, 1, 3);
     }
 
-    @Test
-    void testCopyVector3Constructor() {
-        final Vector3{{ E }} vector = new Vector3{{ E }}(new Vector3{{ E }}(0, 1, 2));
-        TestUtil{{ E }}.assertEquals(vector, 0, 1, 2);
-    }
-
     @Test
     void testCopyVector4Constructor() {
         final Vector3{{ E }} vector = new Vector3{{ E }}(new Vector4{{ E }}(0, 1, 2, 3));
@@ -444,12 +438,6 @@ public class Vector3{{ E }}Test {
         Assertions.assertFalse(new Vector3{{ E }}(122, 43, 96).equals(new Vector3{{ E }}(378, 95, 96)));
     }
 
-    @Test
-    void testCloning() {
-        final Vector3{{ E }} vector = new Vector3{{ E }}(3, 2, 5);
-        Assertions.assertEquals(vector, vector.clone());
-    }
-
     @Test
     void testVectorFromN() {
         final Vector3{{ E }} vector = Vector3{{ E }}.from(1);
diff --git a/src/test/template/float/com/flowpowered/math/test/vector/Vector4{{E}}Test.java.peb b/src/test/template/float/com/flowpowered/math/test/vector/Vector4{{E}}Test.java.peb
index 8c3a8a8..0d97264 100644
--- a/src/test/template/float/com/flowpowered/math/test/vector/Vector4{{E}}Test.java.peb
+++ b/src/test/template/float/com/flowpowered/math/test/vector/Vector4{{E}}Test.java.peb
@@ -14,8 +14,8 @@ import org.spongepowered.math.vector.VectorN{{ E }};
 public class Vector4{{ E }}Test {
 
     @Test
-    void testEmptyConstructor() {
-        final Vector4{{ E }} vector = new Vector4{{ E }}();
+    void testZero() {
+        final Vector4{{ E }} vector = Vector4{{ E }}.ZERO;
         TestUtil{{ E }}.assertEquals(vector, 0, 0, 0, 0);
     }
 
@@ -55,12 +55,6 @@ public class Vector4{{ E }}Test {
         TestUtil{{ E }}.assertEquals(vector, 0, 1, 1, 2);
     }
 
-    @Test
-    void testCopyVector4Constructor() {
-        final Vector4{{ E }} vector = new Vector4{{ E }}(new Vector4{{ E }}(0, 1, 1, 2));
-        TestUtil{{ E }}.assertEquals(vector, 0, 1, 1, 2);
-    }
-
     @Test
     void testCopyVectorNConstructor() {
         final Vector4{{ E }} vector = new Vector4{{ E }}(new VectorN{{ E }}(0, 1, 1, 2, 5));
@@ -432,12 +426,6 @@ public class Vector4{{ E }}Test {
         Assertions.assertFalse(new Vector4{{ E }}(122, 43, 96, 50).equals(new Vector4{{ E }}(378, 95, 96, 0)));
     }
 
-    @Test
-    void testCloning() {
-        final Vector4{{ E }} vector = new Vector4{{ E }}(3, 2, 5, 6);
-        Assertions.assertEquals(vector, vector.clone());
-    }
-
     @Test
     void testVectorFromN() {
         final Vector4{{ E }} vector = Vector4{{ E }}.from(1);
diff --git a/src/test/template/float/com/flowpowered/math/test/vector/VectorN{{E}}Test.java.peb b/src/test/template/float/com/flowpowered/math/test/vector/VectorN{{E}}Test.java.peb
index e3e9072..e6f157b 100644
--- a/src/test/template/float/com/flowpowered/math/test/vector/VectorN{{E}}Test.java.peb
+++ b/src/test/template/float/com/flowpowered/math/test/vector/VectorN{{E}}Test.java.peb
@@ -392,4 +392,5 @@ public class VectorN{{ E }}Test {
         final VectorN{{ E }} vector = new VectorN{{ E }}(1, 2, 3);
         Assertions.assertEquals(vector, vector.clone());
     }
+
 }
diff --git a/src/test/template/integer/com/flowpowered/math/test/vector/Vector2{{E}}Test.java.peb b/src/test/template/integer/com/flowpowered/math/test/vector/Vector2{{E}}Test.java.peb
index b5edb7e..856dd86 100644
--- a/src/test/template/integer/com/flowpowered/math/test/vector/Vector2{{E}}Test.java.peb
+++ b/src/test/template/integer/com/flowpowered/math/test/vector/Vector2{{E}}Test.java.peb
@@ -15,17 +15,11 @@ import org.spongepowered.math.vector.VectorN{{ E }};
 public class Vector2{{ E }}Test {
 
     @Test
-    void testEmptyConstructor() {
-        final Vector2{{ E }} vector = new Vector2{{ E }}();
+    void testZero() {
+        final Vector2{{ E }} vector = Vector2{{ E }}.ZERO;
         TestUtil{{ E }}.assertEquals(vector, ({{ e }}) 0, ({{ e }}) 0);
     }
 
-    @Test
-    void testCopyVector2Constructor() {
-        final Vector2{{ E }} vector = new Vector2{{ E }}(new Vector2{{ E }}(0, 1));
-        TestUtil{{ E }}.assertEquals(vector, ({{ e }}) 0, ({{ e }}) 1);
-    }
-
     @Test
     void testCopyVector3Constructor() {
         final Vector2{{ E }} vector = new Vector2{{ E }}(new Vector3{{ E }}(0, 1, 2));
@@ -385,10 +379,4 @@ public class Vector2{{ E }}Test {
         Assertions.assertFalse(new Vector2{{ E }}(122, 43).equals(new Vector2{{ E }}(378, 95)));
     }
 
-    @Test
-    void testCloning() {
-        final Vector2{{ E }} vector = new Vector2{{ E }}(3, 2);
-        Assertions.assertEquals(vector, vector.clone());
-    }
-
 }
diff --git a/src/test/template/integer/com/flowpowered/math/test/vector/Vector3{{E}}Test.java.peb b/src/test/template/integer/com/flowpowered/math/test/vector/Vector3{{E}}Test.java.peb
index 4f7dc56..00d407a 100644
--- a/src/test/template/integer/com/flowpowered/math/test/vector/Vector3{{E}}Test.java.peb
+++ b/src/test/template/integer/com/flowpowered/math/test/vector/Vector3{{E}}Test.java.peb
@@ -15,8 +15,8 @@ import org.spongepowered.math.vector.VectorN{{ E }};
 public class Vector3{{ E }}Test {
 
     @Test
-    void testEmptyConstructor() {
-        final Vector3{{ E }} vector = new Vector3{{ E }}();
+    void testZero() {
+        final Vector3{{ E }} vector = Vector3{{ E }}.ZERO;
         TestUtil{{ E }}.assertEquals(vector, ({{ e }}) 0, ({{ e }}) 0, ({{ e }}) 0);
     }
 
@@ -32,12 +32,6 @@ public class Vector3{{ E }}Test {
         TestUtil{{ E }}.assertEquals(vector, ({{ e }}) 0, ({{ e }}) 1, ({{ e }}) 3);
     }
 
-    @Test
-    void testCopyVector3Constructor() {
-        final Vector3{{ E }} vector = new Vector3{{ E }}(new Vector3{{ E }}(0, 1, 2));
-        TestUtil{{ E }}.assertEquals(vector, ({{ e }}) 0, ({{ e }}) 1, ({{ e }}) 2);
-    }
-
     @Test
     void testCopyVector4Constructor() {
         final Vector3{{ E }} vector = new Vector3{{ E }}(new Vector4{{ E }}(0, 1, 2, 3));
@@ -402,10 +396,4 @@ public class Vector3{{ E }}Test {
         Assertions.assertFalse(new Vector3{{ E }}(122, 43, 96).equals(new Vector3{{ E }}(378, 95, 96)));
     }
 
-    @Test
-    void testCloning() {
-        final Vector3{{ E }} vector = new Vector3{{ E }}(3, 2, 5);
-        Assertions.assertEquals(vector, vector.clone());
-    }
-
 }
diff --git a/src/test/template/integer/com/flowpowered/math/test/vector/Vector4{{E}}Test.java.peb b/src/test/template/integer/com/flowpowered/math/test/vector/Vector4{{E}}Test.java.peb
index eb88dd0..6db758e 100644
--- a/src/test/template/integer/com/flowpowered/math/test/vector/Vector4{{E}}Test.java.peb
+++ b/src/test/template/integer/com/flowpowered/math/test/vector/Vector4{{E}}Test.java.peb
@@ -13,8 +13,8 @@ import org.spongepowered.math.vector.VectorN{{ E }};
 public class Vector4{{ E }}Test {
 
     @Test
-    void testEmptyConstructor() {
-        final Vector4{{ E }} vector = new Vector4{{ E }}();
+    void testZero() {
+        final Vector4{{ E }} vector = Vector4{{ E }}.ZERO;
         TestUtil{{ E }}.assertEquals(vector, 0, 0, 0, 0);
     }
 
@@ -42,12 +42,6 @@ public class Vector4{{ E }}Test {
         TestUtil{{ E }}.assertEquals(vector, 0, 1, 1, 2);
     }
 
-    @Test
-    void testCopyVector4Constructor() {
-        final Vector4{{ E }} vector = new Vector4{{ E }}(new Vector4{{ E }}(0, 1, 1, 2));
-        TestUtil{{ E }}.assertEquals(vector, 0, 1, 1, 2);
-    }
-
     @Test
     void testCopyVectorNConstructor() {
         final Vector4{{ E }} vector = new Vector4{{ E }}(new VectorN{{ E }}(0, 1, 1, 2, 5));
@@ -381,10 +375,4 @@ public class Vector4{{ E }}Test {
         Assertions.assertFalse(new Vector4{{ E }}(122, 43, 96, 50).equals(new Vector4{{ E }}(378, 95, 96, 0)));
     }
 
-    @Test
-    void testCloning() {
-        final Vector4{{ E }} vector = new Vector4{{ E }}(3, 2, 5, 6);
-        Assertions.assertEquals(vector, vector.clone());
-    }
-
 }