1 files changed, 17 insertions, 19 deletions
diff --git a/common/object/src/tests.rs b/common/object/src/tests.rs
index 73f7b6f..b6455f5 100644
--- a/common/object/src/tests.rs
+++ b/common/object/src/tests.rs
@@ -4,28 +4,27 @@
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
 
-use crate::{Object, ObjectBuffer, fields};
+use crate::{EMPTY, OBB, Object, fields};
 
 fields! {
-    NAME: &str = b"name";
+    NAME: str = b"name";
     AGE: u32 = b"age1";
-    FRIEND: &str = b"frnd";
+    FRIEND: str = b"frnd";
     STUFF: Object = b"stff";
 }
 
-fn test_object() -> ObjectBuffer {
-    ObjectBuffer::new(&mut [
-        (NAME.0, &"Bob"),
-        (AGE.0, &35_u32),
-        (FRIEND.0, &"Alice"),
-        (FRIEND.0, &"Charlie"),
-    ])
+fn test_object() -> Box<Object> {
+    OBB::new()
+        .with(NAME, "Bob")
+        .with(AGE, 35)
+        .with(FRIEND, "Alice")
+        .with(FRIEND, "Charlie")
+        .finish()
 }
 
 #[test]
 fn read_single_field() {
     let bob = test_object();
-    let bob = bob.as_object();
     assert_eq!(bob.get(NAME), Some("Bob"));
     assert_eq!(bob.get(AGE), Some(35));
 }
@@ -33,7 +32,6 @@ fn read_single_field() {
 #[test]
 fn read_multi_field() {
     let bob = test_object();
-    let bob = bob.as_object();
 
     let mut friends = bob.iter(FRIEND);
     assert_eq!(friends.next(), Some("Alice"));
@@ -56,10 +54,10 @@ fn vec_align_test() {
 #[test]
 fn insert() {
     let bob = test_object();
-    let edward = bob.as_object().insert(NAME, "Edward");
+    let edward = bob.insert(NAME, "Edward");
 
-    eprintln!("{:#?}", bob.as_object());
-    let edward = edward.as_object();
+    eprintln!("{:#?}", bob);
+    let edward = edward;
     eprintln!("{edward:#?}");
     assert_eq!(edward.get(NAME), Some("Edward"));
     assert_eq!(edward.get(AGE), Some(35));
@@ -72,11 +70,11 @@ fn insert() {
 
 #[test]
 fn insert_empty() {
-    let ob = Object::EMPTY.insert(NAME, "Romeo");
-    assert_eq!(ob.as_object().get(NAME), Some("Romeo"));
+    let ob = EMPTY.insert(NAME, "Romeo");
+    assert_eq!(ob.get(NAME), Some("Romeo"));
 
-    let ob = Object::EMPTY.insert(STUFF, Object::EMPTY);
-    assert_eq!(ob.as_object().get(STUFF), Some(Object::EMPTY));
+    let ob = EMPTY.insert(STUFF, EMPTY);
+    assert_eq!(ob.get(STUFF), Some(EMPTY));
 }
 
 #[test]