diff --git a/tests/unit/libexpr/nix_api_expr.cc b/tests/unit/libexpr/nix_api_expr.cc
index 60a33a5cf..0389306ec 100644
--- a/tests/unit/libexpr/nix_api_expr.cc
+++ b/tests/unit/libexpr/nix_api_expr.cc
@@ -51,24 +51,19 @@ TEST_F(nix_api_expr_test, nix_expr_eval_drv)
 {
     auto expr = R"(derivation { name = "myname"; builder = "mybuilder"; system = "mysystem"; })";
     nix_expr_eval_from_string(nullptr, state, expr, ".", value);
-    nix_value_force(nullptr, state, value);
-
     ASSERT_EQ(NIX_TYPE_ATTRS, nix_get_type(nullptr, value));
 
-    auto stateFn = nix_state_create(nullptr, nullptr, store);
-    auto valueFn = nix_alloc_value(nullptr, state);
+    EvalState * stateFn = nix_state_create(nullptr, nullptr, store);
+    Value * valueFn = nix_alloc_value(nullptr, state);
     nix_expr_eval_from_string(nullptr, stateFn, "builtins.toString", ".", valueFn);
-
     ASSERT_EQ(NIX_TYPE_FUNCTION, nix_get_type(nullptr, valueFn));
 
-    auto stateResult = nix_state_create(nullptr, nullptr, store);
-    auto valueResult = nix_alloc_value(nullptr, stateResult);
-
+    EvalState * stateResult = nix_state_create(nullptr, nullptr, store);
+    Value * valueResult = nix_alloc_value(nullptr, stateResult);
     nix_value_call(ctx, stateResult, valueFn, value, valueResult);
-    nix_value_force(nullptr, stateResult, valueResult);
-
-    auto p = nix_get_string(nullptr, valueResult);
+    ASSERT_EQ(NIX_TYPE_STRING, nix_get_type(nullptr, valueResult));
 
+    const char * p = nix_get_string(nullptr, valueResult);
     ASSERT_STREQ("/nix/store/40s0qmrfb45vlh6610rk29ym318dswdr-myname", p);
 
     // Clean up
@@ -79,4 +74,34 @@ TEST_F(nix_api_expr_test, nix_expr_eval_drv)
     nix_state_free(stateResult);
 }
 
+TEST_F(nix_api_expr_test, nix_build_drv)
+{
+    auto expr = R"(derivation { name = "myname";
+                                system = builtins.currentSystem;
+                                builder = "/bin/sh";
+                                args = [ "-c" "echo hello world > $out" ];
+                              })";
+    nix_expr_eval_from_string(nullptr, state, expr, ".", value);
+
+    Value * drvPathValue = nix_get_attr_byname(nullptr, value, state, "drvPath");
+    const char * drvPath = nix_get_string(nullptr, drvPathValue);
+    ASSERT_STREQ("/nix/store/5fxx84dpz59ch79wf9x8ja715p7hf3q1-myname.drv", drvPath);
+
+    StorePath * drvStorePath = nix_store_parse_path(ctx, store, drvPath);
+    ASSERT_EQ(true, nix_store_is_valid_path(nullptr, store, drvStorePath));
+
+    Value * outPathValue = nix_get_attr_byname(nullptr, value, state, "outPath");
+    const char * outPath = nix_get_string(nullptr, outPathValue);
+    ASSERT_STREQ("/nix/store/rp0xk0641l8hpdb84fsx3kwwrl45pxan-myname", outPath);
+
+    StorePath * outStorePath = nix_store_parse_path(ctx, store, outPath);
+    ASSERT_EQ(false, nix_store_is_valid_path(nullptr, store, outStorePath));
+
+    nix_store_build(ctx, store, drvStorePath, nullptr, nullptr);
+    ASSERT_EQ(true, nix_store_is_valid_path(nullptr, store, outStorePath));
+
+    // Clean up
+    nix_store_path_free(drvStorePath);
+    nix_store_path_free(outStorePath);
+}
 }
diff --git a/tests/unit/libexpr/nix_api_value.cc b/tests/unit/libexpr/nix_api_value.cc
new file mode 100644
index 000000000..ce9cfd68b
--- /dev/null
+++ b/tests/unit/libexpr/nix_api_value.cc
@@ -0,0 +1,61 @@
+#include "nix_api_store.h"
+#include "nix_api_store_internal.h"
+#include "nix_api_util.h"
+#include "nix_api_util_internal.h"
+#include "nix_api_expr.h"
+#include "nix_api_value.h"
+
+#include "tests/nix_api_store.hh"
+
+#include <gtest/gtest.h>
+
+namespace nixC {
+
+class nix_api_value_test : public nix_api_store_test
+{
+public:
+    nix_api_value_test()
+    {
+        state = nix_state_create(nullptr, nullptr, store);
+        value = nix_alloc_value(nullptr, state);
+    }
+    ~nix_api_value_test()
+    {
+        nix_gc_decref(nullptr, value);
+        nix_state_free(state);
+    }
+
+    EvalState * state;
+    Value * value;
+};
+
+TEST_F(nix_api_value_test, nix_value_set_get_int)
+{
+    int myInt = 1;
+    nix_set_int(nullptr, value, myInt);
+
+    ASSERT_EQ(myInt, nix_get_int(nullptr, value));
+}
+
+TEST_F(nix_api_value_test, nix_value_make_list)
+{
+    int size = 10;
+    nix_make_list(nullptr, state, value, size);
+    ASSERT_EQ(size, nix_get_list_size(nullptr, value));
+}
+
+TEST_F(nix_api_value_test, nix_value_set_get_list)
+{
+    int size = 10;
+    nix_make_list(nullptr, state, value, size);
+
+    Value * intValue = nix_alloc_value(nullptr, state);
+    nix_set_int(nullptr, intValue, 42);
+    nix_set_list_byidx(nullptr, value, 0, intValue);
+
+    ASSERT_EQ(42, nix_get_int(nullptr, nix_get_list_byidx(nullptr, value, state, 0)));
+
+    // Clean up
+    nix_gc_decref(nullptr, intValue);
+}
+}