diff --git a/autotest/ValueRef/ValueRef.cpp b/autotest/ValueRef/ValueRef.cpp
new file mode 100644
index 000000000..b81acb93e
--- /dev/null
+++ b/autotest/ValueRef/ValueRef.cpp
@@ -0,0 +1,65 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+bool OK;
+
+#define CHECK(x, ref) { \
+String val = AsString(x); \
+bool ok = val == ref; \
+LOG("CHECK(" << #x << ", " << AsCString(val) << "); " << (ok ? "" : "#FAILED")); \
+OK == OK && ok; }
+
+CONSOLE_APP_MAIN
+{
+	OK = true;
+
+	StdLogSetup(LOG_COUT|LOG_FILE);
+
+	ValueMap m;
+	m("key1", "value1");
+	m("key2", "value2");
+	
+	Value vm = m;
+	Value vm2 = m;	
+	vm.At(1) = "123";
+	
+	CHECK(vm, "{ key1: value1, key2: 123 }");
+	CHECK(vm2, "{ key1: value1, key2: value2 }");
+
+	Value json;
+	Value& h = json("monday");
+	h("morning")(0) = GetSysDate();
+	h("morning")(1) = GetSysDate();
+	h("evening") = "supper";
+	CHECK(json, "{ monday: { morning: [09/12/2014, 09/12/2014], evening: supper } }");
+	
+	ValueArray va;
+	va.Add("Node");
+
+	Value v = va;
+
+	Value& v1 = va.At(1);
+
+	v1 = 123;
+	
+	CHECK(va, "[Node, 123]");
+	
+	Value v2;
+	v2.At(0) = 1;
+	Value v3 = v2;
+	v2.At(1) = 2;
+	CHECK(v2, "[1, 2]");
+	CHECK(v3, "[1]");
+
+	{	
+		Value va;
+		CHECK(va, "");
+		va << 1;
+		CHECK(va, "[1]");
+		va << 1 << "dva" << 3.0;
+		CHECK(va, "[1, 1, dva, 3]");
+	}
+	
+	ASSERT(OK);
+}
diff --git a/autotest/ValueRef/ValueRef.upp b/autotest/ValueRef/ValueRef.upp
new file mode 100644
index 000000000..011951ff1
--- /dev/null
+++ b/autotest/ValueRef/ValueRef.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	ValueRef.cpp;
+
+mainconfig
+	"" = "SSE2";
+
diff --git a/autotest/ValueRef/init b/autotest/ValueRef/init
new file mode 100644
index 000000000..640b46377
--- /dev/null
+++ b/autotest/ValueRef/init
@@ -0,0 +1,4 @@
+#ifndef _ValueRef_icpp_init_stub
+#define _ValueRef_icpp_init_stub
+#include "Core/init"
+#endif