diff --git a/repertory/repertory_test/src/encryption_test.cpp b/repertory/repertory_test/src/encryption_test.cpp
index 1531c792..baa3fedc 100644
--- a/repertory/repertory_test/src/encryption_test.cpp
+++ b/repertory/repertory_test/src/encryption_test.cpp
@@ -62,25 +62,31 @@ TEST(encryption, encrypt_data_buffer_with_key) {
 
 TEST(encryption, encrypt_data_pointer) {
   data_buffer result;
-  utils::encryption::encrypt_data(token, &buffer[0u], buffer.size(), result);
+  utils::encryption::encrypt_data(
+      token, reinterpret_cast<const unsigned char *>(buffer.data()),
+      buffer.size(), result);
   test_encrypted_result(result);
 }
 
 TEST(encryption, encrypt_data_pointer_with_key) {
   const auto key = utils::encryption::generate_key(token);
   data_buffer result;
-  utils::encryption::encrypt_data(key, &buffer[0u], buffer.size(), result);
+  utils::encryption::encrypt_data(
+      key, reinterpret_cast<const unsigned char *>(buffer.data()),
+      buffer.size(), result);
   test_encrypted_result(result);
 }
 
 TEST(encryption, decrypt_data_pointer) {
   const auto key = utils::encryption::generate_key(token);
   data_buffer result;
-  utils::encryption::encrypt_data(key, &buffer[0u], buffer.size(), result);
+  utils::encryption::encrypt_data(
+      key, reinterpret_cast<const unsigned char *>(buffer.data()),
+      buffer.size(), result);
 
   std::string data;
-  EXPECT_TRUE(
-      utils::encryption::decrypt_data(token, &result[0u], result.size(), data));
+  EXPECT_TRUE(utils::encryption::decrypt_data(token, result.data(),
+                                              result.size(), data));
 
   EXPECT_EQ(buffer.size(), data.size());
   EXPECT_STREQ(buffer.c_str(), data.c_str());
@@ -89,7 +95,9 @@ TEST(encryption, decrypt_data_pointer) {
 TEST(encryption, decrypt_data_buffer_with_key) {
   const auto key = utils::encryption::generate_key(token);
   data_buffer result;
-  utils::encryption::encrypt_data(key, &buffer[0u], buffer.size(), result);
+  utils::encryption::encrypt_data(
+      key, reinterpret_cast<const unsigned char *>(buffer.data()),
+      buffer.size(), result);
 
   std::string data;
   EXPECT_TRUE(utils::encryption::decrypt_data(key, result, data));
@@ -101,11 +109,13 @@ TEST(encryption, decrypt_data_buffer_with_key) {
 TEST(encryption, decrypt_data_pointer_with_key) {
   const auto key = utils::encryption::generate_key(token);
   data_buffer result;
-  utils::encryption::encrypt_data(key, &buffer[0u], buffer.size(), result);
+  utils::encryption::encrypt_data(
+      key, reinterpret_cast<const unsigned char *>(buffer.data()),
+      buffer.size(), result);
 
   std::string data;
   EXPECT_TRUE(
-      utils::encryption::decrypt_data(key, &result[0u], result.size(), data));
+      utils::encryption::decrypt_data(key, result.data(), result.size(), data));
 
   EXPECT_EQ(buffer.size(), data.size());
   EXPECT_STREQ(buffer.c_str(), data.c_str());
@@ -114,10 +124,12 @@ TEST(encryption, decrypt_data_pointer_with_key) {
 TEST(encryption, decryption_failure) {
   const auto key = utils::encryption::generate_key(token);
   data_buffer result;
-  utils::encryption::encrypt_data(key, &buffer[0u], buffer.size(), result);
-  result[0u] = 0u;
-  result[1u] = 1u;
-  result[2u] = 2u;
+  utils::encryption::encrypt_data(
+      key, reinterpret_cast<const unsigned char *>(buffer.data()),
+      buffer.size(), result);
+  result[0U] = 0U;
+  result[1U] = 1U;
+  result[2U] = 2U;
 
   std::string data;
   EXPECT_FALSE(utils::encryption::decrypt_data(key, result, data));