diff --git a/ChangeLog b/ChangeLog
index 2340351dd..76c51fb4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* tests/gobject/gvalue-test.c: Add more tests.
+
 2006-02-17  Kang Jeong-Hee  <keizie@gmail.com>
 
 	* glib/gutf8.c (g_utf8_find_prev_char): Correct documentation typo.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2340351dd..76c51fb4b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2006-02-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* tests/gobject/gvalue-test.c: Add more tests.
+
 2006-02-17  Kang Jeong-Hee  <keizie@gmail.com>
 
 	* glib/gutf8.c (g_utf8_find_prev_char): Correct documentation typo.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 2340351dd..76c51fb4b 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2006-02-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* tests/gobject/gvalue-test.c: Add more tests.
+
 2006-02-17  Kang Jeong-Hee  <keizie@gmail.com>
 
 	* glib/gutf8.c (g_utf8_find_prev_char): Correct documentation typo.
diff --git a/tests/gobject/gvalue-test.c b/tests/gobject/gvalue-test.c
index 8e0a8123e..2d721e032 100644
--- a/tests/gobject/gvalue-test.c
+++ b/tests/gobject/gvalue-test.c
@@ -31,6 +31,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include "gobject/gvaluecollector.h"
 
 static void
 test_enum_transformation (void)
@@ -86,12 +87,288 @@ test_enum_transformation (void)
  g_assert (g_value_get_uint64 (&xform) == 1);
 }
 
+
+static void
+test_gtype_value (void)
+{
+  GType type;
+  GValue value = { 0, };
+  GValue copy = { 0, };
+
+  g_value_init (&value, G_TYPE_GTYPE);
+
+  g_value_set_gtype (&value, G_TYPE_BOXED);
+  type = g_value_get_gtype (&value);
+  g_assert (type == G_TYPE_BOXED);
+
+  g_value_init (&copy, G_TYPE_GTYPE);
+  g_value_copy (&value, &copy);
+  type = g_value_get_gtype (&copy);
+  g_assert (type == G_TYPE_BOXED);
+}
+
+static gchar *
+collect (GValue *value, ...)
+{
+  gchar *error;
+  va_list var_args;
+
+  error = NULL;
+
+  va_start (var_args, value);
+  G_VALUE_COLLECT (value, var_args, 0, &error);
+  va_end (var_args);
+
+  return error;
+}	 
+
+static gchar *
+lcopy (GValue *value, ...)
+{
+  gchar *error;
+  va_list var_args;
+
+  error = NULL;
+
+  va_start (var_args, value);
+  G_VALUE_LCOPY (value, var_args, 0, &error);
+  va_end (var_args);
+
+  return error;
+}	 
+
+static void
+test_collection (void)
+{
+  GValue value = { 0, };
+  gchar *error;
+  
+  g_value_init (&value, G_TYPE_CHAR);
+  error = collect (&value, 'c');
+  g_assert (error == NULL);
+  g_assert (g_value_get_char (&value) == 'c');
+  
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_UCHAR);
+  error = collect (&value, 129);
+  g_assert (error == NULL);
+  g_assert (g_value_get_uchar (&value) == 129);
+  
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_BOOLEAN);
+  error = collect (&value, TRUE);
+  g_assert (error == NULL);
+  g_assert (g_value_get_boolean (&value) == TRUE);
+  
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_INT);
+  error = collect (&value, G_MAXINT);
+  g_assert (error == NULL);
+  g_assert (g_value_get_int (&value) == G_MAXINT);
+  
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_UINT);
+  error = collect (&value, G_MAXUINT);
+  g_assert (error == NULL);
+  g_assert (g_value_get_uint (&value) == G_MAXUINT);
+  
+  g_value_unset (&value);  
+  g_value_init (&value, G_TYPE_LONG);
+  error = collect (&value, G_MAXLONG);
+  g_assert (error == NULL);
+  g_assert (g_value_get_long (&value) == G_MAXLONG);
+  
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_ULONG);
+  error = collect (&value, G_MAXULONG);
+  g_assert (error == NULL);
+  g_assert (g_value_get_ulong (&value) == G_MAXULONG);
+  
+  g_value_unset (&value);  
+  g_value_init (&value, G_TYPE_INT64);
+  error = collect (&value, G_MAXINT64);
+  g_assert (error == NULL);
+  g_assert (g_value_get_int64 (&value) == G_MAXINT64);
+  
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_UINT64);
+  error = collect (&value, G_MAXUINT64);
+  g_assert (error == NULL);
+  g_assert (g_value_get_uint64 (&value) == G_MAXUINT64);
+  
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_FLOAT);
+  error = collect (&value, G_MAXFLOAT);
+  g_assert (error == NULL);
+  g_assert (g_value_get_float (&value) == G_MAXFLOAT);
+  
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_DOUBLE);
+  error = collect (&value, G_MAXDOUBLE);
+  g_assert (error == NULL);
+  g_assert (g_value_get_double (&value) == G_MAXDOUBLE);
+  
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_STRING);
+  error = collect (&value, "string ?");
+  g_assert (error == NULL);
+  g_assert (strcmp (g_value_get_string (&value), "string ?") == 0);
+  
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_GTYPE);
+  error = collect (&value, G_TYPE_BOXED);
+  g_assert (error == NULL);
+  g_assert (g_value_get_gtype (&value) == G_TYPE_BOXED);
+}
+
+static void
+test_copying (void)
+{
+  GValue value = { 0, };
+  gchar *error;
+
+  {
+    gchar c = 0;
+
+    g_value_init (&value, G_TYPE_CHAR);
+    g_value_set_char (&value, 'c');
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (c == 'c');
+  }  
+
+  {
+    guchar c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_UCHAR);
+    g_value_set_uchar (&value, 129);
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (c == 129);
+  }  
+
+  {
+    gint c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_INT);
+    g_value_set_int (&value, G_MAXINT);
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (c == G_MAXINT);
+  }  
+
+  {
+    guint c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_UINT);
+    g_value_set_uint (&value, G_MAXUINT);
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (c == G_MAXUINT);
+  }  
+
+  {
+    glong c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_LONG);
+    g_value_set_long (&value, G_MAXLONG);
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (c == G_MAXLONG);
+  }  
+
+  {
+    gulong c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_ULONG);
+    g_value_set_ulong (&value, G_MAXULONG);
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (c == G_MAXULONG);
+  }  
+
+  {
+    gint64 c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_INT64);
+    g_value_set_int64 (&value, G_MAXINT64);
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (c == G_MAXINT64);
+  }  
+
+  {
+    guint64 c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_UINT64);
+    g_value_set_uint64 (&value, G_MAXUINT64);
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (c == G_MAXUINT64);
+  }  
+
+  {
+    gfloat c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_FLOAT);
+    g_value_set_float (&value, G_MAXFLOAT);
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (c == G_MAXFLOAT);
+  }  
+
+  {
+    gdouble c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_DOUBLE);
+    g_value_set_double (&value, G_MAXDOUBLE);
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (c == G_MAXDOUBLE);
+  }  
+
+  {
+    gchar *c = NULL;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_STRING);
+    g_value_set_string (&value, "string ?");
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (strcmp (c, "string ?") == 0);
+  }  
+
+  {
+    GType c = G_TYPE_NONE;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_GTYPE);
+    g_value_set_gtype (&value, G_TYPE_BOXED);
+    error = lcopy (&value, &c);
+    g_assert (error == NULL);
+    g_assert (c == G_TYPE_BOXED);
+  }  
+}
+
+
 int
 main (int argc, char *argv[])
 {
   g_type_init (); 
   
   test_enum_transformation ();
+  test_gtype_value ();
+  test_collection ();
+  test_copying ();
 
   return 0;
 }