diff --git a/ChangeLog b/ChangeLog
index f827cfcfa..5a964d91d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-17  David Ayers  <d.ayers@inode.at>
+
+	* Testing/GNUmakefile: Reactivate nsinvocation test.
+	* Testing/nsmethodsignature.m
+	(large/smallStruct_id:uchar:ushort:uint...): Correct name.
+	(void_float:double:): New test.
+	(void_double:float:): New test.
+
 2004-08-17 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSPort.m, Source/NSPortNameServer.m: Fix port type
diff --git a/Testing/GNUmakefile b/Testing/GNUmakefile
index 22eadb0c7..be08783df 100644
--- a/Testing/GNUmakefile
+++ b/Testing/GNUmakefile
@@ -53,6 +53,7 @@ CHECKABLE_TOOLS = \
 		nshashtable \
 		nshost \
 		nsindexset \
+		nsinvocation \
 		nsmaptable \
 		nsmethodsignature \
 		nsnotification \
diff --git a/Testing/nsmethodsignature.m b/Testing/nsmethodsignature.m
index 73387c490..89b39a83d 100644
--- a/Testing/nsmethodsignature.m
+++ b/Testing/nsmethodsignature.m
@@ -94,6 +94,8 @@ typedef struct _MySmallStruct MySmallStruct;
 -(void)void_largeStruct:(MyLargeStruct)_str;
 -(void)void_smallStruct:(MySmallStruct)_str;
 
+-(void)void_float:(float)_float double:(double)_double;
+-(void)void_double:(double)_double float:(float)_float;
 
 -(MyLargeStruct)largeStruct_id:(id)_id
 			  char:(char)_char
@@ -104,7 +106,7 @@ typedef struct _MySmallStruct MySmallStruct;
 			double:(double)_double
 		   largeStruct:(MyLargeStruct)_lstr
 		   smallStruct:(MySmallStruct)_sstr;
--(MySmallStruct)largeStruct_id:(id)_id
+-(MySmallStruct)smallStruct_id:(id)_id
 			 uchar:(unsigned char)_uchar
 			ushort:(unsigned short)_ushort
 			  uint:(unsigned int)_uint
@@ -168,6 +170,9 @@ typedef struct _MySmallStruct MySmallStruct;
 -(void)void_largeStruct:(MyLargeStruct)_str {}
 -(void)void_smallStruct:(MySmallStruct)_str {}
 
+-(void)void_float:(float)_float double:(double)_double {}
+-(void)void_double:(double)_double float:(float)_float {}
+
 
 -(MyLargeStruct)largeStruct_id:(id)_id
 			  char:(char)_char
@@ -179,7 +184,7 @@ typedef struct _MySmallStruct MySmallStruct;
 		   largeStruct:(MyLargeStruct)_lstr
 		   smallStruct:(MySmallStruct)_sstr { return _lstr; }
 
--(MySmallStruct)largeStruct_id:(id)_id
+-(MySmallStruct)smallStruct_id:(id)_id
 			 uchar:(unsigned char)_uchar
 			ushort:(unsigned short)_ushort
 			  uint:(unsigned int)_uint