diff --git a/src/test/java/org/springframework/data/aerospike/SampleClasses.java b/src/test/java/org/springframework/data/aerospike/SampleClasses.java
index 3ad7eacc0..fa6be9ed8 100644
--- a/src/test/java/org/springframework/data/aerospike/SampleClasses.java
+++ b/src/test/java/org/springframework/data/aerospike/SampleClasses.java
@@ -751,84 +751,84 @@ public static class DocumentWithIntArray {
     @Data
     @AllArgsConstructor
     @Document
-    public static class DocumentWithAtomicFields {
+    public static class DocumentWithBigIntegerAndNestedArray {
 
         @Id
+        @NonNull
         private String id;
         @Field
-        private AtomicInteger atomicInteger;
-        @Field
-        private AtomicLong atomicLong;
+        @NonNull
+        private BigInteger bigInteger;
+        private ObjectWithIntegerArray objectWithArray;
+    }
+
+    @Data
+    public static class ObjectWithIntegerArray {
+
+        @Version
+        public Long version;
+        Integer[] array;
+
+        public ObjectWithIntegerArray(Integer[] array) {
+            this.array = array;
+        }
     }
 
     @Data
     @AllArgsConstructor
     @Document
-    public static class DocumentWithURL {
+    public static class DocumentWithByteArrayList {
 
         @Id
         private String id;
         @Field
-        private URL url;
+        private List<Byte> array;
     }
 
     @Data
     @AllArgsConstructor
     @Document
-    public static class DocumentWithUUID {
+    public static class DocumentWithAtomicFields {
 
         @Id
         private String id;
         @Field
-        private UUID uuid;
+        private AtomicInteger atomicInteger;
+        @Field
+        private AtomicLong atomicLong;
     }
 
     @Data
     @AllArgsConstructor
     @Document
-    public static class DocumentWithCurrency {
+    public static class DocumentWithURL {
 
         @Id
         private String id;
         @Field
-        private Currency currency;
+        private URL url;
     }
 
     @Data
     @AllArgsConstructor
     @Document
-    public static class DocumentWithBigIntegerAndNestedArray {
+    public static class DocumentWithUUID {
 
         @Id
-        @NonNull
         private String id;
         @Field
-        @NonNull
-        private BigInteger bigInteger;
-        private ObjectWithArray objectWithArray;
-    }
-
-    @Data
-    public static class ObjectWithArray {
-
-        @Version
-        public Long version;
-        Integer[] array;
-
-        public ObjectWithArray(Integer[] array) {
-            this.array = array;
-        }
+        private UUID uuid;
     }
 
     @Data
     @AllArgsConstructor
     @Document
-    public static class DocumentWithByteArrayList {
+    public static class DocumentWithCurrency {
 
         @Id
         private String id;
         @Field
-        private List<Byte> array;
+        private Currency currency;
     }
 
     @Data
diff --git a/src/test/java/org/springframework/data/aerospike/core/AerospikeTemplateSaveTests.java b/src/test/java/org/springframework/data/aerospike/core/AerospikeTemplateSaveTests.java
index 0a042f327..7cf82c3d2 100644
--- a/src/test/java/org/springframework/data/aerospike/core/AerospikeTemplateSaveTests.java
+++ b/src/test/java/org/springframework/data/aerospike/core/AerospikeTemplateSaveTests.java
@@ -88,7 +88,7 @@ public void shouldSaveDocumentWithArray() {
     @Test
     public void shouldSaveDocumentWithNestedArrayAndBigInteger() {
         Integer[] array = new Integer[]{0, 1, 2, 3, 4};
-        SampleClasses.ObjectWithArray objectWithArray = new SampleClasses.ObjectWithArray(array);
+        SampleClasses.ObjectWithIntegerArray objectWithArray = new SampleClasses.ObjectWithIntegerArray(array);
         BigInteger bigInteger = new BigInteger("100");
         SampleClasses.DocumentWithBigIntegerAndNestedArray doc =
             new SampleClasses.DocumentWithBigIntegerAndNestedArray(id, bigInteger, objectWithArray);