diff --git a/include/xrpl/basics/base_uint.h b/include/xrpl/basics/base_uint.h
index 1eacb16385..ca83b8e220 100644
--- a/include/xrpl/basics/base_uint.h
+++ b/include/xrpl/basics/base_uint.h
@@ -636,7 +636,12 @@ template <std::size_t Bits, class Tag>
 inline std::string
 to_short_string(base_uint<Bits, Tag> const& a)
 {
-    return to_string(a).substr(0, 8) + "...";
+    // LCOV_EXCL_START
+    if constexpr (a.bytes <= 4)
+        return to_string(a);
+    else
+        // LCOV_EXCL_STOP
+        return strHex(a.cbegin(), a.cbegin() + 4) + "...";
 }
 
 template <std::size_t Bits, class Tag>
diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h
index 3aea274e53..7d14f23c92 100644
--- a/src/test/jtx/TestHelpers.h
+++ b/src/test/jtx/TestHelpers.h
@@ -361,7 +361,7 @@ ownerCount(test::jtx::Env const& env, test::jtx::Account const& account);
 
 [[nodiscard]]
 inline bool
-checkVL(Slice const& result, std::string expected)
+checkVL(Slice const& result, std::string const& expected)
 {
     Serializer s;
     s.addRaw(result);
diff --git a/src/test/jtx/amount.h b/src/test/jtx/amount.h
index d0b21d31ce..fbe78bf3ec 100644
--- a/src/test/jtx/amount.h
+++ b/src/test/jtx/amount.h
@@ -181,7 +181,7 @@ struct PrettyAsset
 {
 private:
     Asset asset_;
-    std::uint64_t scale_;
+    std::uint32_t scale_;
 
 public:
     template <typename A>
diff --git a/src/test/unit_test/FileDirGuard.h b/src/test/unit_test/FileDirGuard.h
index ea7efc49a7..d3cabc2092 100644
--- a/src/test/unit_test/FileDirGuard.h
+++ b/src/test/unit_test/FileDirGuard.h
@@ -29,7 +29,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <fstream>
 
 namespace ripple {
-
 namespace detail {
 
 /**