diff --git a/t/Form/Email.t b/t/Form/Email.t
index ce83eda78..6703fa729 100644
--- a/t/Form/Email.t
+++ b/t/Form/Email.t
@@ -17,7 +17,8 @@ use WebGUI::Form;
 use WebGUI::Form::Email;
 use WebGUI::Session;
 use HTML::Form;
-use Test::MockObject;
+use Tie::IxHash;
+use WebGUI::Form_Checking;
 
 #The goal of this test is to verify that Email form elements work.
 #The Email form accepts and validates an email address.
@@ -28,7 +29,19 @@ my $session = WebGUI::Test->session;
 
 # put your tests here
 
-my $numTests = 8;
+my %testBlock;
+
+tie %testBlock, 'Tie::IxHash';
+
+%testBlock = (
+	EMAIL1 => [ 'me@nowhere.com', 'EQUAL', 'regular email address'],
+	EMAIL2 => [ "what do you want?", undef, 'not an email address'],
+);
+
+my $formType = 'text';
+my $formClass = 'WebGUI::Form::Email';
+
+my $numTests = 12 + scalar keys %testBlock;
 
 diag("Planning on running $numTests tests\n");
 
@@ -38,7 +51,7 @@ my ($header, $footer) = (WebGUI::Form::formHeader($session), WebGUI::Form::formF
 
 my $html = join "\n",
 	$header, 
-	WebGUI::Form::Email->new($session, {
+	$formClass->new($session, {
 		name => 'TestEmail',
 		value => 'me@nowhere.com',
 	})->toHtml,
@@ -57,28 +70,30 @@ is(scalar @inputs, 1, 'The form has 1 input');
 
 my $input = $inputs[0];
 is($input->name, 'TestEmail', 'Checking input name');
-is($input->type, 'text', 'Checking input type');
+is($input->type, $formType, 'Checking input type');
 is($input->value, 'me@nowhere.com', 'Checking default value');
 is($input->disabled, undef, 'Disabled param not sent to form');
+is($input->{size}, 30, 'Checking size param, default');
+is($input->{maxlength}, 255, 'Checking maxlength param, default');
+
+$html = join "\n",
+	$header, 
+	$formClass->new($session, {
+		name => 'email2',
+		value => q!Some & text in " here!,
+		size => 25,
+		maxlength => 200,
+	})->toHtml,
+	$footer;
+
+@forms = HTML::Form->parse($html, 'http://www.webgui.org');
+@inputs = $forms[0]->inputs;
+$input = $inputs[0];
+is($input->name, 'email2', 'Checking input name');
+is($input->value, 'Some & text in " here', 'Checking default value');
+is($input->{size}, 25, 'Checking size param, set');
+is($input->{maxlength}, 200, 'Checking maxlength param, set');
 
 ##Test Form Output parsing
 
-my $request = Test::MockObject->new;
-$request->mock('body',
-	sub {
-		my ($self, $value) = @_;
-		my @return = ();
-		return 'me@nowhere.com' if ($value eq 'TestEmail');
-		return "what do you want?" if ($value eq 'TestEmail2');
-		return;
-	}
-);
-$session->{_request} = $request;
-
-my $value = $session->form->get('TestEmail', 'Email');
-is($value, 'me@nowhere.com', 'checking existent form value');
-$value = $session->form->get('TestEmail2', 'Email');
-is($value, undef, 'checking form postprocessing for bad email address');
-
-##Email form does no preprocessing of its input
-
+WebGUI::Form_Checking::auto_check($session, 'email', %testBlock);
diff --git a/t/Form/Float.t b/t/Form/Float.t
index 6959790c0..36efcea20 100644
--- a/t/Form/Float.t
+++ b/t/Form/Float.t
@@ -18,7 +18,8 @@ use WebGUI::Form::Float;
 use WebGUI::Session;
 use Tie::IxHash;
 use HTML::Form;
-use Test::MockObject;
+use Tie::IxHash;
+use WebGUI::Form_Checking;
 
 #The goal of this test is to verify that Float form elements work
 
@@ -33,17 +34,21 @@ my %testBlock;
 tie %testBlock, 'Tie::IxHash';
 
 %testBlock = (
-	TestInteger  => [ '-1.23456', 1, 'valid, negative float'],
-	TestInteger2 => [ '.23456', 1, 'valid, no integer part'],
-	TestInteger3 => [ '123456789.', 1, 'valid, no fractional part'],
-	TestInteger4 => [ '-.123456', 1, 'valid, negative, no integer part'],
-	TestInteger5 => [ '+123.456', 0, 'invalid, no explicit plus sign'],
-	TestInteger6 => [ '123456', 1, 'WRONG, no decimal point'],
-	TestInteger7 => [ '......', 1, 'WRONG, no digits'],
-	TestInteger8 => [ '.123-456', 0, 'invalid, embedded minus sign'],
+	FLOAT1 => [ '-1.23456',   'EQUAL', 'valid, negative float'],
+	FLOAT2 => [ '.23456',     'EQUAL', 'valid, no integer part'],
+	FLOAT3 => [ '123456789.', 'EQUAL', 'valid, no fractional part'],
+	FLOAT4 => [ '-.123456',   'EQUAL', 'valid, negative, no integer part'],
+	FLOAT5 => [ '+123.456',    0, 'invalid, no explicit plus sign'],
+	FLOAT6 => [ '123456',      'EQUAL', 'WRONG, no decimal point'],
+	FLOAT7 => [ '......',      'EQUAL', 'WRONG, no digits'],
+	FLOAT7 => [ '-00789.25',   'EQUAL', 'leading zeroes are okay'],
+	FLOAT8 => [ '.123-456',    0, 'invalid, embedded minus sign'],
 );
 
-my $numTests = 6 + scalar keys %testBlock;
+my $formClass = 'WebGUI::Form::Float';
+my $formType = 'Float';
+
+my $numTests = 12 + scalar keys %testBlock;
 
 diag("Planning on running $numTests tests\n");
 
@@ -53,7 +58,7 @@ my ($header, $footer) = (WebGUI::Form::formHeader($session), WebGUI::Form::formF
 
 my $html = join "\n",
 	$header, 
-	WebGUI::Form::Float->new($session, {
+	$formClass->new($session, {
 		name => 'TestFloat',
 		value => '12.3456',
 	})->toHtml,
@@ -75,23 +80,28 @@ is($input->name, 'TestFloat', 'Checking input name');
 is($input->type, 'text', 'Checking input type');
 is($input->value, '12.3456', 'Checking default value');
 is($input->disabled, undef, 'Disabled param not sent to form');
+is($input->{size}, 11, 'Default size');
+is($input->{maxlength}, 14, 'Default maxlength');
+
+my $html = join "\n",
+	$header, 
+	$formClass->new($session, {
+		name => 'TestFloat2',
+		value => '00789.25',
+		size => 15,
+		maxlength => 20,
+	})->toHtml,
+	$footer;
+
+@forms = HTML::Form->parse($html, 'http://www.webgui.org');
+@inputs = $forms[0]->inputs;
+my $input = $inputs[0];
+is($input->name, 'TestFloat2', 'Checking input name');
+is($input->value, '00789.25', 'Checking default value');
+is($input->{size}, 15, 'set size');
+is($input->{maxlength}, 20, 'set maxlength');
 
 ##Test Form Output parsing
 
-my $request = Test::MockObject->new;
-$request->mock('body',
-	sub {
-		my ($self, $value) = @_;
-		return $testBlock{$value}->[0] if (exists $testBlock{$value});
-		return;
-	}
-);
+WebGUI::Form_Checking::auto_check($session, $formType, %testBlock);
 
-$session->{_request} = $request;
-
-foreach my $key (keys %testBlock) {
-	my ($testValue, $passes, $comment) = @{ $testBlock{$key} };
-	my $value = $session->form->get($key, 'float');
-	is($value, ($passes ? $testValue : 0.0), $comment);
-}
-##Integer Forms have no special value preprocessing,
diff --git a/t/Form/Integer.t b/t/Form/Integer.t
index 456ac23e8..334692b46 100644
--- a/t/Form/Integer.t
+++ b/t/Form/Integer.t
@@ -17,7 +17,8 @@ use WebGUI::Form;
 use WebGUI::Form::Integer;
 use WebGUI::Session;
 use HTML::Form;
-use Test::MockObject;
+use Tie::IxHash;
+use WebGUI::Form_Checking;
 
 #The goal of this test is to verify that Integer form elements work
 
@@ -27,7 +28,22 @@ my $session = WebGUI::Test->session;
 
 # put your tests here
 
-my $numTests = 10;
+my %testBlock;
+
+tie %testBlock, 'Tie::IxHash';
+
+%testBlock = (
+	INT1 => [ '-123456',  'EQUAL', 'valid, negative integer'],
+	INT1 => [ '002300',  'EQUAL', 'valid, leading zeroes'],
+	INT2 => [ '+123456',  0, 'reject explicitly positive integer'],
+	INT3 => [ '123-456.', 0, 'rejects non-sense integer with negative sign'],
+	INT4 => [ '123.456',  0, 'rejects float'],
+);
+
+my $formClass = 'WebGUI::Form::Integer';
+my $formType = 'Integer';
+
+my $numTests = 12 + scalar keys %testBlock;
 
 diag("Planning on running $numTests tests\n");
 
@@ -37,7 +53,7 @@ my ($header, $footer) = (WebGUI::Form::formHeader($session), WebGUI::Form::formF
 
 my $html = join "\n",
 	$header, 
-	WebGUI::Form::Integer->new($session, {
+	$formClass->new($session, {
 		name => 'TestInteger',
 		value => '123456',
 	})->toHtml,
@@ -59,30 +75,30 @@ is($input->name, 'TestInteger', 'Checking input name');
 is($input->type, 'text', 'Checking input type');
 is($input->value, '123456', 'Checking default value');
 is($input->disabled, undef, 'Disabled param not sent to form');
+is($input->{size}, 11, 'Default size');
+is($input->{maxlength}, 11, 'Default maxlength');
 
 ##Test Form Output parsing
 
-my $request = Test::MockObject->new;
-$request->mock('body',
-	sub {
-		my ($self, $value) = @_;
-		my @return = ();
-		return '-123456' if ($value eq 'TestInteger');
-		return "+123456" if ($value eq 'TestInteger2');
-		return "123-456" if ($value eq 'TestInteger3');
-		return "123.456" if ($value eq 'TestInteger4');
-		return;
-	}
-);
-$session->{_request} = $request;
+my $html = join "\n",
+	$header, 
+	$formClass->new($session, {
+		name => 'TestInt2',
+		value => '98765',
+		size => 15,
+		maxlength => 20,
+	})->toHtml,
+	$footer;
 
-my $value = $session->form->get('TestInteger', 'integer');
-is($value, '-123456', 'checking negative integer');
-$value = $session->form->get('TestInteger2', 'integer');
-is($value, 0, 'checking form rejects explicitly postive integer');
-$value = $session->form->get('TestInteger3', 'integer');
-is($value, 0, 'checking form rejects non-sense integer');
-$value = $session->form->get('TestInteger4', 'integer');
-is($value, 0, 'checking form rejects non-sense integer');
+@forms = HTML::Form->parse($html, 'http://www.webgui.org');
+@inputs = $forms[0]->inputs;
+my $input = $inputs[0];
+is($input->name, 'TestInt2', 'Checking input name');
+is($input->value, '98765', 'Checking default value');
+is($input->{size}, 15, 'set size');
+is($input->{maxlength}, 20, 'set maxlength');
+
+##Test Form Output parsing
+
+WebGUI::Form_Checking::auto_check($session, $formType, %testBlock);
 
-##Integer Forms have no special value preprocessing,