diff --git a/src/main/java/org/springframework/data/aerospike/config/AerospikeSettings.java b/src/main/java/org/springframework/data/aerospike/config/AerospikeSettings.java
index c32d85238..5ce0a9e9e 100644
--- a/src/main/java/org/springframework/data/aerospike/config/AerospikeSettings.java
+++ b/src/main/java/org/springframework/data/aerospike/config/AerospikeSettings.java
@@ -12,20 +12,20 @@ public class AerospikeSettings {
     // Namespace
     String namespace;
     // Enable scan operation
-    boolean scansEnabled;
+    boolean scansEnabled = false;
     // Send user defined key in addition to hash digest on both reads and writes
-    boolean sendKey;
+    boolean sendKey = true;
     // Create secondary indexes specified using `@Indexed` annotation on startup
-    boolean createIndexesOnStartup;
+    boolean createIndexesOnStartup = true;
     // Automatically refresh indexes cache every <N> seconds
-    int indexCacheRefreshSeconds;
+    int indexCacheRefreshSeconds = 3600;
     // Automatically refresh cached server version every <N> seconds
-    int serverVersionRefreshSeconds;
+    int serverVersionRefreshSeconds = 3600;
     // Limit amount of results returned by server. Non-positive value means no limit
-    long queryMaxRecords;
+    long queryMaxRecords = 10_000L;
     // Maximum batch size for batch write operations
-    int batchWriteSize;
+    int batchWriteSize = 100;
     // Define how @Id fields (primary keys) and Map keys are stored: false - always as String,
     // true - preserve original type if supported
-    boolean keepOriginalKeyTypes;
+    boolean keepOriginalKeyTypes = false;
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index f06797a94..856876b61 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 spring-data-aerospike.hosts=localhost:3000
-spring-data-aerospike.namespace=TEST
+spring-data-aerospike.namespace=test
 spring-data-aerospike.scans-enabled=false
 spring-data-aerospike.send-key=true
 spring-data-aerospike.create-indexes-on-startup=true
diff --git a/src/test/java/org/springframework/data/aerospike/repository/PersonRepositoryQueryTests.java b/src/test/java/org/springframework/data/aerospike/repository/PersonRepositoryQueryTests.java
index ec4970daf..fca6687af 100644
--- a/src/test/java/org/springframework/data/aerospike/repository/PersonRepositoryQueryTests.java
+++ b/src/test/java/org/springframework/data/aerospike/repository/PersonRepositoryQueryTests.java
@@ -2267,7 +2267,7 @@ void findPersonsByFriendFriendAddressZipCode() {
     }
 
     @Test
-        // find by deeply nested String POJO field
+    // find by deeply nested String POJO field
     void findPersonsByFriendFriendFriendFriendFriendFriendFriendFriendBestFriendFriendAddressZipCode() {
         String zipCode = "C0123";
         Address address = new Address("Foo Street 1", 1, zipCode, "Bar");
@@ -2306,7 +2306,7 @@ void findPersonsByFriendFriendFriendFriendFriendFriendFriendFriendBestFriendFrie
     }
 
     @Test
-        // find by deeply nested Integer POJO field
+    // find by deeply nested Integer POJO field
     void findPersonsByFriendFriendFriendFriendFriendFriendFriendFriendBestFriendAddressApartmentNumber() {
         int apartment = 10;
         Address address = new Address("Foo Street 1", apartment, "C0123", "Bar");
@@ -2345,7 +2345,7 @@ void findPersonsByFriendFriendFriendFriendFriendFriendFriendFriendBestFriendAddr
     }
 
     @Test
-        // find by deeply nested POJO
+    // find by deeply nested POJO
     void findPersonsByFriendFriendFriendFriendFriendFriendFriendFriendBestFriendBestFriendAddress() {
         if (serverVersionSupport.findByPojo()) {
             Address address = new Address("Foo Street 1", 1, "C0123", "Bar");