diff --git a/DEVICES b/DEVICES
index 580e618a5..e2256a7bd 100644
--- a/DEVICES
+++ b/DEVICES
@@ -172,5 +172,5 @@ BSIM3SOI_PD - SOI model (partially depleted devices)
       There is a bsim3soipd directory under the test
       hierarchy. The tests come from the bsim3soi
       web site at: 
-      http://www-device.eecs.berkeley.edu/~bsim3soi
+      http://www-device.eecs.berkeley.edu/~bsimsoi
       
diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c
index 89a8a948f..35cb345ec 100644
--- a/src/spicelib/parser/inp2m.c
+++ b/src/spicelib/parser/inp2m.c
@@ -66,7 +66,6 @@ INP2M (void *ckt, INPtables * tab, card * current)
   INPgetTok (&line, &nname5, 1);	/*  get 5th token  */
   thismodel = (INPmodel *) NULL;
   INPgetMod (ckt, nname5, &thismodel, tab);
-  printf("Model=%x",thismodel);
   if (thismodel == NULL)
     {				/*  5th token is not a model in the table  */
       nodeflag = 1;		/*  now specify a 5 node device  */
diff --git a/tests/bsim3soipd/Makefile.am b/tests/bsim3soipd/Makefile.am
new file mode 100644
index 000000000..acf97dd4a
--- /dev/null
+++ b/tests/bsim3soipd/Makefile.am
@@ -0,0 +1,16 @@
+## Process this file with automake to produce Makefile.in
+
+TESTS = \
+	t3.cir	\
+	t4.cir	\
+	t5.cir	\
+	inv2.cir	\
+	RampVg2.cir
+
+TESTS_ENVIRONMENT = $(SHELL) $(srcdir)/../check.sh $(top_builddir)/src/ngspice
+
+EXTRA_DIST = \
+	$(TESTS)		\
+	$(TESTS:.cir=.out)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/tests/bsim3soipd/RampVg2.cir b/tests/bsim3soipd/RampVg2.cir
new file mode 100644
index 000000000..7d918c4ff
--- /dev/null
+++ b/tests/bsim3soipd/RampVg2.cir
@@ -0,0 +1,19 @@
+* BSIMSOI example
+*
+* SOI, Ramp Vg
+
+Vd   d 0 1.5
+Vg   g 0 0.0 PULSE 0V  2V  .02n  .1n  .1n  .2n  .6n
+Ve   e 0 0.0
+Vs   s 0 0.0
+Vb   b 0 0.0
+
+m1 d g s e n1 w=10u l=0.25u debug=-1
+
+.option gmin=1e-20 itl1=200 itl2=200 abstol=1e-9
+.tran 1p 1.0ns
+.print m1#Vbs, V(g)/10
+.include nmospd.mod
+
+.end
+
diff --git a/tests/bsim3soipd/inv2.cir b/tests/bsim3soipd/inv2.cir
new file mode 100644
index 000000000..5da309d8e
--- /dev/null
+++ b/tests/bsim3soipd/inv2.cir
@@ -0,0 +1,17 @@
+* model = BSIMSOI
+*
+*
+* SOI Inverter - floating body
+
+vin in 0 dc 2.5
+vdd dd 0 dc 2.5
+vss ss 0 dc 0
+ve  e  0 dc 1.25
+m1 out in dd e p1 w=20u l=0.25u 
+m2 out in ss e n1 w=10u l=0.25u
+
+.option itl1=500 gmin=1e-25
+.dc vin 0 2.5 0.01 
+.print v(in), v(out)
+.include nmospd.mod
+.include pmospd.mod
diff --git a/tests/bsim3soipd/t3.cir b/tests/bsim3soipd/t3.cir
new file mode 100644
index 000000000..b12f78ce6
--- /dev/null
+++ b/tests/bsim3soipd/t3.cir
@@ -0,0 +1,18 @@
+*model = BSIMSOI
+*Berkeley Spice Compatibility 
+*
+* SOI NMOSFET, floating body simulation
+
+vd d 0 dc 1.5
+vs s 0 dc 0
+ve e 0 dc 0
+vg g 0 dc 3
+
+
+m1 d g s e n1 w=10u l=0.25u
+
+.option gmin=1e-25 itl1=500
+.dc vd 0 3 0.01 vg 0.5 3 0.5
+.print v(g), i(vs)
+.include nmospd.mod
+
diff --git a/tests/bsim3soipd/t4.cir b/tests/bsim3soipd/t4.cir
new file mode 100644
index 000000000..42bb202f5
--- /dev/null
+++ b/tests/bsim3soipd/t4.cir
@@ -0,0 +1,19 @@
+*model = BSIMSOI
+*Berkeley Spice Compatibility 
+*
+* SOI NMOSFET, tied body simulation
+
+vd d 0 dc 0.05
+vs s 0 dc 0
+ve e 0 dc 0
+vg g 0 dc 3
+vb b 0 dc 0
+
+m1 d g s e b n1 w=10u l=0.25u
+
+.option gmin=1e-25 itl1=500
+.dc vg 0 1.5 0.01 vb -0.3 0.5 0.1
+.include nmosfd.mod
+
+* For PD, the command '.include nmosfd.mod ' should
+* be replaced with '.include nmospd.mod'.