diff --git a/autotest/InetMessage/InetMessage.cpp b/autotest/InetMessage/InetMessage.cpp
index 8246c2ed6..dbd635e3c 100644
--- a/autotest/InetMessage/InetMessage.cpp
+++ b/autotest/InetMessage/InetMessage.cpp
@@ -5,8 +5,8 @@ using namespace Upp;
 
 void Test(const InetMessage& msg, int ii, int count, const char *txt = NULL, const char *mime = NULL)
 {
-	LOG("Testing part " << ii);
 	String body = msg[ii].Decode();
+	LOG("Testing part " << ii << ' ' << body.GetCount());
 	ASSERT(body.GetCount() == count);
 	ASSERT(body.Find(txt) >= 0);
 	if(mime) {
@@ -34,6 +34,19 @@ CONSOLE_APP_MAIN
 	Test(msg, 1, 119, "Tato zpráva neobsahuje viry ani jiný škodlivý kód - avast! Antivirus je aktivní.");
 	Test(msg, 3, 909, "Tato zpráva neobsahuje viry ani jiný škodlivý kód -<a href=");
 	Test(msg, 4, 309891);
+	
+	DLOG("=========================================================");
+
+	String m1 = msg.GetMessage();
+	SaveFile(GetHomeDirFile("msg1.txt"), m1);
+	InetMessage msg2;
+	ASSERT(msg2.Read(m1));
+	String m2 = msg2.GetMessage();
+	SaveFile(GetHomeDirFile("msg2.txt"), m2);
+	ASSERT(m1 == m2);
+
+	DeleteFile(GetHomeDirFile("msg1.txt"));
+	DeleteFile(GetHomeDirFile("msg2.txt"));
 
 	DLOG("=========================================================");
 	ASSERT(msg.Read(LoadFile(GetDataFile("msg2.txt"))));
diff --git a/autotest/One/One.cpp b/autotest/One/One.cpp
new file mode 100644
index 000000000..55615a325
--- /dev/null
+++ b/autotest/One/One.cpp
@@ -0,0 +1,25 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+struct Base { int x; virtual ~Base() {} };
+struct Derived : Base { int y; };
+
+CONSOLE_APP_MAIN
+{
+	One<int> x;
+	x.Create();
+
+	One<Base> o;
+
+	ASSERT(!o.Is<Base>());
+	ASSERT(!o.Is<Derived>());
+
+	o.Create();
+	ASSERT(o.Is<Base>());
+	ASSERT(!o.Is<Derived>());
+	
+	o.Create<Derived>();
+	ASSERT(o.Is<Base>());
+	ASSERT(o.Is<Derived>());
+}
diff --git a/autotest/One/One.upp b/autotest/One/One.upp
new file mode 100644
index 000000000..b409500a5
--- /dev/null
+++ b/autotest/One/One.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	One.cpp;
+
+mainconfig
+	"" = "SSE2";
+
diff --git a/autotest/One/init b/autotest/One/init
new file mode 100644
index 000000000..35d551a3e
--- /dev/null
+++ b/autotest/One/init
@@ -0,0 +1,4 @@
+#ifndef _One_icpp_init_stub
+#define _One_icpp_init_stub
+#include "Core/init"
+#endif