diff --git a/autotest/Gtypes/Gtypes.cpp b/autotest/Gtypes/Gtypes.cpp
new file mode 100644
index 000000000..75692cd4e
--- /dev/null
+++ b/autotest/Gtypes/Gtypes.cpp
@@ -0,0 +1,15 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	StdLogSetup(LOG_COUT|LOG_FILE);
+	
+	Rect r(2, 4, 6, 8);
+	
+	ASSERT(r * 2 == Rect(4, 8, 12, 16));
+	ASSERT(r / 2 == Rect(1, 2, 3, 4));
+	
+	LOG("================= OK");
+}
diff --git a/autotest/Gtypes/Gtypes.upp b/autotest/Gtypes/Gtypes.upp
new file mode 100644
index 000000000..cd4ee4084
--- /dev/null
+++ b/autotest/Gtypes/Gtypes.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	Gtypes.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/autotest/RangeCoLoop/init b/autotest/RangeCoLoop/init
deleted file mode 100644
index 92c4498c2..000000000
--- a/autotest/RangeCoLoop/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _RangeCoLoop_icpp_init_stub
-#define _RangeCoLoop_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/util_fn/init b/autotest/util_fn/init
deleted file mode 100644
index ccc919608..000000000
--- a/autotest/util_fn/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _util_fn_icpp_init_stub
-#define _util_fn_icpp_init_stub
-#include "Core/init"
-#endif