diff --git a/tests/testrig.c b/tests/testrig.c
index 5b85eeab9..78e4eba9d 100644
--- a/tests/testrig.c
+++ b/tests/testrig.c
@@ -2,14 +2,15 @@
  * Hamlib sample program
  */
 
-#include <hamlib/rig.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdlib.h>
+#include <hamlib/rig.h>
 
 #define SERIAL_PORT "/dev/ttyS0"
 
-int main ()
+int main (int argc, char *argv[])
 { 
 	RIG *my_rig;		/* handle to rig (nstance) */
 	freq_t freq;		/* frequency  */
@@ -34,14 +35,13 @@ int main ()
 		exit(3);
 	}
 
-#if 1
-  	my_rig = rig_init(RIG_MODEL_IC706MKIIG);
-#else
-	my_rig = rig_init(RIG_MODEL_FT747);
-#endif
-
-	if (!my_rig)
-			exit(1); /* whoops! something went wrong (mem alloc?) */
+	my_rig = rig_init(atoi(argv[1]));
+		
+	if (!my_rig) {
+		fprintf(stderr,"Unknown rig num: %d\n", atoi(argv[1]));
+		fprintf(stderr,"Please check riglist.h\n");
+		exit(1); /* whoops! something went wrong (mem alloc?) */
+	}
 
 	strncpy(my_rig->state.rig_path,SERIAL_PORT,FILPATHLEN);
 
@@ -61,7 +61,6 @@ int main ()
 	 * and some error checking on the return code.
 	 */
 
-/*  	retcode = rig_set_vfo(my_rig, RIG_VFO_MAIN); */
 	retcode = rig_set_vfo(my_rig, RIG_VFO_B);
 
 
@@ -76,13 +75,12 @@ int main ()
 	 *
 	 */
 	
-#ifdef RIG_PASSBAND_OLDTIME
 	/* 10m FM Narrow */
 
 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 28350125); /* 10m */
-	retcode = rig_set_mode(my_rig, RIG_VFO_CURR, RIG_MODE_FM, RIG_PASSBAND_NARROW);
+	retcode = rig_set_mode(my_rig, RIG_VFO_CURR, RIG_MODE_FM, 
+					rig_passband_narrow(my_rig, RIG_MODE_FM));
 	sleep(3);		/* so you can see it -- FS */
-#endif
 
 	/* 15m USB */
 
@@ -102,13 +100,12 @@ int main ()
 	retcode = rig_set_mode(my_rig, RIG_VFO_CURR, RIG_MODE_LSB, RIG_PASSBAND_NORMAL);
 	sleep(3);
 
-#ifdef RIG_PASSBAND_OLDTIME
 	/* 80m AM NArrow */
 
 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 3980000); /* 80m  */
-	retcode = rig_set_mode(my_rig, RIG_VFO_CURR, RIG_MODE_AM, RIG_PASSBAND_NARROW);
+	retcode = rig_set_mode(my_rig, RIG_VFO_CURR, RIG_MODE_AM, 
+					rig_passband_narrow(my_rig, RIG_MODE_FM));
 	sleep(3);
-#endif
 
 	/* 160m CW Normal */
 
@@ -116,12 +113,11 @@ int main ()
 	retcode = rig_set_mode(my_rig, RIG_VFO_CURR, RIG_MODE_CW, RIG_PASSBAND_NORMAL);
 	sleep(3);
 
-#ifdef RIG_PASSBAND_OLDTIME
 	/* 160m CW Narrow -- The band is noisy tonight -- FS*/
 
-	retcode = rig_set_mode(my_rig, RIG_VFO_CURR, RIG_MODE_CW, RIG_PASSBAND_NARROW);
+	retcode = rig_set_mode(my_rig, RIG_VFO_CURR, RIG_MODE_CW,
+					rig_passband_narrow(my_rig, RIG_MODE_FM));
 	sleep(3);
-#endif
 
 	/* 20m USB on VFO_A */