diff --git a/upptst/SvoValue/SvoValue.cpp b/upptst/SvoValue/SvoValue.cpp
index 0c5d59ab8..12dc69665 100644
--- a/upptst/SvoValue/SvoValue.cpp
+++ b/upptst/SvoValue/SvoValue.cpp
@@ -56,8 +56,24 @@ GUI_APP_MAIN
 	uuid.d = 19999;
 	CheckType(uuid, true);
 
-	CheckType(Arial(50), true);
+	CheckType(Arial(50).Bold().Strikeout(), true);
 
+	{
+		DrawingDraw g(100, 100);
+		g.DrawText(0, 0, "Hello world");
+		Drawing x = g.GetResult();
+		CheckType(x);	
+	}
+
+	{
+		PaintingPainter g(100, 100);
+		g.DrawText(0, 0, "Hello world");
+		Painting x = g.GetResult();
+		CheckType(x);
+	}
+
+	CheckType(CtrlImg::save());
+	
 	v = ErrorValue("error");
 	CheckType(v, true);
 	ASSERT(v.IsVoid());
@@ -103,4 +119,6 @@ GUI_APP_MAIN
 	
 	RLOG("------------------------------");
 	RLOG("######## Everything is OK");
+	
+	PromptOK("OK");
 }
diff --git a/upptst/SvoValue/SvoValue.h b/upptst/SvoValue/SvoValue.h
index 2821eaa4a..2f390dd19 100644
--- a/upptst/SvoValue/SvoValue.h
+++ b/upptst/SvoValue/SvoValue.h
@@ -2,6 +2,7 @@
 #define _SvoValue_SvoValue_h_
 
 #include <CtrlLib/CtrlLib.h>
+#include <Painter/Painter.h>
 
 using namespace Upp;
 
@@ -175,6 +176,23 @@ void CheckType(const T& x, bool checkhash = false)
 		LoadFromJson(ty, json);
 		RDUMP(ty);
 		ASSERT(IsNull(vv));
+
+		RDUMP(v);
+		tx = x;
+		xml = StoreAsXML(tx, "test");
+		RDUMP(xml);
+		ty = Null;
+		LoadFromXML(ty, xml);
+		RDUMP(ty);
+		ASSERT(StoreAsXML(tx, "X") == StoreAsXML(x, "X"));
+		
+		json = StoreAsJson(tx);
+		RDUMP(json);
+		ty = Null;
+		LoadFromJson(ty, json);
+		RDUMP(ty);
+		ASSERT(StoreAsJson(tx) == StoreAsJson(x));
+		ASSERT(IsNull(vv));
 	}
 }
 
diff --git a/upptst/SvoValue/SvoValue.upp b/upptst/SvoValue/SvoValue.upp
index 9b08c205f..449d09c9b 100644
--- a/upptst/SvoValue/SvoValue.upp
+++ b/upptst/SvoValue/SvoValue.upp
@@ -4,7 +4,8 @@ optimize_speed;
 
 uses
 	Core,
-	CtrlLib;
+	CtrlLib,
+	Painter;
 
 file
 	SvoValue.h,
@@ -14,5 +15,6 @@ file
 	SvoValue.cpp optimize_speed;
 
 mainconfig
-	"" = "SSE2 SVO_VALUE GUI";
+	"" = "SSE2 SVO_VALUE GUI",
+	"" = "SSE2 OLD_VALUE GUI";
 
diff --git a/upptst/SvoValue/init b/upptst/SvoValue/init
index 4307fa1b8..d7c69a540 100644
--- a/upptst/SvoValue/init
+++ b/upptst/SvoValue/init
@@ -2,4 +2,5 @@
 #define _SvoValue_icpp_init_stub
 #include "Core/init"
 #include "CtrlLib/init"
+#include "Painter/init"
 #endif