Index: /branches/release-40/t/20-setup.t
===================================================================
--- /branches/release-40/t/20-setup.t (revision 2247)
+++ /branches/release-40/t/20-setup.t (revision 2562)
@@ -12,4 +12,5 @@
 
 use MT;
+use MT::Test;
 use MT::Author;
 use MT::Blog;
Index: /branches/release-40/t/12-dsa.t
===================================================================
--- /branches/release-40/t/12-dsa.t (revision 1100)
+++ /branches/release-40/t/12-dsa.t (revision 2562)
@@ -11,4 +11,5 @@
 
 use MT;
+use MT::Test;
 use MT::Builder;
 use MT::Util qw(dsa_verify perl_sha1_digest_hex dec2bin);
Index: /branches/release-40/t/21-callbacks.t
===================================================================
--- /branches/release-40/t/21-callbacks.t (revision 2069)
+++ /branches/release-40/t/21-callbacks.t (revision 2562)
@@ -6,5 +6,4 @@
 use Test::More tests => 5;
 use CGI;
-use DB_File;
 
 use lib 'extlib';
@@ -13,4 +12,5 @@
 
 use MT;
+use MT::Test;
 use MT::Plugin;
 use MT::Entry;
@@ -77,20 +77,2 @@
 is($entry2->text, $TEST_TEXT, 'on-disk obj altered');
 
-=pod
-
-# TBD: generalize this
-my $driver = MT::ObjectDriver->new('DBI::SQLite');
-
-#my %entries;
-#tie %entries, "DB_File", $mt->{cfg}->DataSource . "/entry.db",
-#                         O_RDWR, 0400, $DB_BTREE
-#    || die $!;
-#my $rec = $entries{$id};
-#$rec = $driver->{serializer}->unserialize($rec);
-#is($$rec->{text}, rot13($TEST_TEXT), 'text rotated');
-
-#is($entry2->text_more, $TEST_TEXT_MORE, '$entry2->text_more()');
-#is($$rec->{text_more}, $TEST_TEXT_MORE, '$$rec->{text_more}');
-
-=cut
-
Index: /branches/release-40/t/13-dirify.t
===================================================================
--- /branches/release-40/t/13-dirify.t (revision 2106)
+++ /branches/release-40/t/13-dirify.t (revision 2562)
@@ -9,4 +9,5 @@
 
 use MT;
+use MT::Test;
 use MT::Util;
 
Index: /branches/release-40/t/09-image.t
===================================================================
--- /branches/release-40/t/09-image.t (revision 1927)
+++ /branches/release-40/t/09-image.t (revision 2562)
@@ -8,4 +8,5 @@
 use lib 'extlib';
 
+use MT::Test;
 use Test::More;
 use File::Spec;
@@ -48,5 +49,5 @@
         my $img = MT::Image->new( Filename => $img_file );
 SKIP : {
-        skip("no $driver image", 17) unless $img;
+        skip("no $driver image", 18) unless $img;
         isa_ok($img, 'MT::Image::' . $driver, "driver $driver with image $img_file is an MT::Image::$driver");
 #        diag( MT::Image->errstr ) if MT::Image->errstr;
Index: /branches/release-40/t/04-config.t
===================================================================
--- /branches/release-40/t/04-config.t (revision 1100)
+++ /branches/release-40/t/04-config.t (revision 2562)
@@ -7,4 +7,6 @@
 use lib 'extlib';
 use lib 't/lib';
+
+use MT::Test;
 
 use Cwd;
Index: /branches/release-40/t/47-i18n-ja.t
===================================================================
--- /branches/release-40/t/47-i18n-ja.t (revision 1098)
+++ /branches/release-40/t/47-i18n-ja.t (revision 2562)
@@ -22,6 +22,6 @@
 
 use Encode;
-use MT::Bootstrap;
 use MT;
+use MT::Test;
 my $mt = new MT;
 
Index: /branches/release-40/t/driver-tests.pl
===================================================================
--- /branches/release-40/t/driver-tests.pl (revision 2540)
+++ /branches/release-40/t/driver-tests.pl (revision 2562)
@@ -26,11 +26,11 @@
 use Test::Deep;
 use lib 't/lib';
-use MT::Test qw(:testdb :time);
 
 BEGIN {
     plan skip_all => "Configuration file $ENV{MT_CONFIG} not found"
-        if !-r $ENV{MT_CONFIG};
-}
-
+        if !-r "t/$ENV{MT_CONFIG}";
+}
+
+use MT::Test qw(:testdb :time);
 plan tests => 186;
 
Index: /branches/release-40/t/62-asset.t
===================================================================
--- /branches/release-40/t/62-asset.t (revision 1098)
+++ /branches/release-40/t/62-asset.t (revision 2562)
@@ -26,10 +26,10 @@
 #    is($asset->class, 'Image', 'class');
     is($asset->class_label, 'Image', 'class_label');
-    is($asset->thumbnail_file({Height => 100, Width => 100}), 't/site/assets_c/1.3b30679660d0d018c5c8b061f4280f3f5cb318ca.jpg', 'thumbnail');
+    is(($asset->thumbnail_file({Height => 100, Width => 100}))[0], 't/site/assets_c/2008/06/test-thumb-640x480.jpg', 'thumbnail');
     is($asset->image_width, 640, 'image_width'); 
     is($asset->image_height, 480, 'height');
-    is($asset->as_html, '<span mt:asset-id="1" class="mt-enclosure mt-enclosure-image"><a href="http://narnia.na/nana/images/test.jpg">View image</a></span>', 'as_html');
-    is($asset->as_html({popup => 1, include => 1}), qq(<span mt:asset-id="1" class="mt-enclosure mt-enclosure-image"><a href="http://narnia.na/nana/images/test.jpg" onclick="window.open('http://narnia.na/nana/images/test.jpg','popup','width=640,height=480,scrollbars=no,resizable=no,toolbar=no,directories=no,location=no,menubar=no,status=no,left=0,top=0'); return false">View image</a></span>), 'as_html_popup');
-    is($asset->as_html({include => 1, wrap_text => 1, align => 'right'}), '<span mt:asset-id="1" class="mt-enclosure mt-enclosure-image"><img alt="test.jpg" src="http://narnia.na/nana/images/test.jpg" width="640" height="480" class="mt-image-right" style="float: right; margin: 0 0 20px 20px;"/></span>', 'as_html_include');
+    is($asset->as_html, '<form mt:asset-id="1" class="mt-enclosure mt-enclosure-image" style="display: inline;"><a href="http://narnia.na/nana/images/test.jpg">View image</a></form>', 'as_html');
+    is($asset->as_html({popup => 1, popup_asset_id => $asset->id, include => 1}), qq(<form mt:asset-id="1" class="mt-enclosure mt-enclosure-image" style="display: inline;"><a href="http://narnia.na/nana/images/test.jpg" onclick="window.open('http://narnia.na/nana/images/test.jpg','popup','width=640,height=480,scrollbars=no,resizable=no,toolbar=no,directories=no,location=no,menubar=no,status=no,left=0,top=0'); return false">View image</a></form>), 'as_html_popup');
+    is($asset->as_html({include => 1, wrap_text => 1, align => 'right'}), '<form mt:asset-id="1" class="mt-enclosure mt-enclosure-image" style="display: inline;"><img alt="Image photo" src="http://narnia.na/nana/images/test.jpg" width="640" height="480" class="mt-image-right" style="float: right; margin: 0 0 20px 20px;" /></form>', 'as_html_include');
 
     #metadata validation
@@ -43,5 +43,5 @@
     is($meta->{mime_type}, 'image/jpeg', 'metadata - mime_type');
     is($meta->{duration}, undef, 'metadata - duration');
-    is($meta->{'Actual Dimensions'}, '640 wide, 480 high', 'metadata - Actual Dimensions');
+    is($meta->{'Actual Dimensions'}, '640 x 480 pixels', 'metadata - Actual Dimensions');
 
     # copy original image file
@@ -53,4 +53,5 @@
     use Data::Dumper;
     my $img_pkg = MT::Asset->class_handler('image');
+    $asset = new $img_pkg;
     isa_ok($asset, 'MT::Asset::Image', 'New object is MT::Asset::Image');
     $asset->blog_id(1);
@@ -99,6 +100,6 @@
     # method validation\
     is($asset_f->class, 'file', 'class');
-    is($asset_f->class_label, 'File', 'class_label');
-    is($asset_f->as_html, '<span mt:asset-id="2" class="mt-enclosure mt-enclosure-file"><a href="http://narnia.na/nana/files/test.tmpl">test.tmpl</a></span>', 'as_html');
+    is($asset_f->class_label, 'Asset', 'class_label');
+    is($asset_f->as_html, '<form mt:asset-id="2" class="mt-enclosure mt-enclosure-file" style="display: inline;"><a href="http://narnia.na/nana/files/test.tmpl">test.tmpl</a></form>', 'as_html');
 
     #metadata validation
Index: /branches/release-40/t/07-builder.t
===================================================================
--- /branches/release-40/t/07-builder.t (revision 1100)
+++ /branches/release-40/t/07-builder.t (revision 2562)
@@ -5,4 +5,6 @@
 use lib 't/lib';
 use lib 'extlib';
+
+use MT::Test;
 
 use Test::More tests => 116;
Index: /branches/release-40/t/49-tagsplit.t
===================================================================
--- /branches/release-40/t/49-tagsplit.t (revision 1098)
+++ /branches/release-40/t/49-tagsplit.t (revision 2562)
@@ -4,4 +4,5 @@
 use lib 't/lib', 'extlib', 'lib', '../lib', '../extlib';
 use Test::More;
+use MT::Test;
 use JSON qw(jsonToObj);
 use MT::Tag;
Index: /branches/release-40/t/14-archive.t
===================================================================
--- /branches/release-40/t/14-archive.t (revision 1100)
+++ /branches/release-40/t/14-archive.t (revision 2562)
@@ -5,4 +5,5 @@
 use Cwd;
 use MT;
+use MT::Test;
 use strict;
 
Index: /branches/release-40/t/11-sanitize.t
===================================================================
--- /branches/release-40/t/11-sanitize.t (revision 1100)
+++ /branches/release-40/t/11-sanitize.t (revision 2562)
@@ -10,4 +10,5 @@
 
 use MT;
+use MT::Test;
 use MT::Sanitize;
 
Index: /branches/release-40/t/46-i18n-en.t
===================================================================
--- /branches/release-40/t/46-i18n-en.t (revision 1098)
+++ /branches/release-40/t/46-i18n-en.t (revision 2562)
@@ -23,4 +23,5 @@
 use Encode;
 use MT;
+use MT::Test;
 use MT::Util;
 my $mt = new MT;
Index: /branches/release-40/t/63-objectclasses.t
===================================================================
--- /branches/release-40/t/63-objectclasses.t (revision 1098)
+++ /branches/release-40/t/63-objectclasses.t (revision 2562)
@@ -2,9 +2,11 @@
 
 use strict;
-use lib 'extlib', 'lib';
+use lib 't/lib', 'extlib', 'lib';
 use Test::More tests => 11;
-use MT::Object;
 
-package MT::Asset;
+use MT::Test;
+my $mt = new MT;
+
+package MT::TestAsset;
 
 our @ISA = qw( MT::Object );
@@ -19,7 +21,7 @@
 });
 
-package MT::Asset::Image;
+package MT::TestAsset::Image;
 
-our @ISA = qw( MT::Asset );
+our @ISA = qw( MT::TestAsset );
 
 __PACKAGE__->install_properties({
@@ -27,7 +29,7 @@
 });
 
-package MT::Asset::Audio;
+package MT::TestAsset::Audio;
 
-our @ISA = qw( MT::Asset );
+our @ISA = qw( MT::TestAsset );
 
 __PACKAGE__->install_properties({
@@ -40,17 +42,17 @@
 package main;
 
-my $file = new MT::Asset;
-my $image = new MT::Asset::Image;
-my $audio = new MT::Asset::Audio;
+my $file = new MT::TestAsset;
+my $image = new MT::TestAsset::Image;
+my $audio = new MT::TestAsset::Audio;
 
-ok($file->has_column('title'));
-ok($image->has_column('title'));
-ok($audio->has_column('title'));
-ok(!$file->has_column('duration'));
-ok(!$image->has_column('duration'));
-ok($audio->has_column('duration'));
-ok($file->class_type eq 'file');
-ok($image->class_type eq 'image');
-ok($audio->class_type eq 'audio');
-ok(MT::Asset->class_type eq 'file');
-ok(MT::Asset::Image->class_type eq 'image');
+ok($file->has_column('title'), 'file has title column');
+ok($image->has_column('title'), 'image has title column');
+ok($audio->has_column('title'), 'audio has title column');
+ok(!$file->has_column('duration'), 'file doesn\'t have column duration');
+ok(!$image->has_column('duration'), 'image doesn\'t have column duration');
+ok($audio->has_column('duration'), 'audio has column duration');
+ok($file->class_type eq 'file', 'file class_type is file');
+ok($image->class_type eq 'image', 'image class_type is image');
+ok($audio->class_type eq 'audio', 'audio class_type is audio');
+ok(MT::TestAsset->class_type eq 'file', 'generic asset class_type is file');
+ok(MT::TestAsset::Image->class_type eq 'image', 'generic image asset class type is image');
Index: /branches/release-40/t/08-util.t
===================================================================
--- /branches/release-40/t/08-util.t (revision 1098)
+++ /branches/release-40/t/08-util.t (revision 2562)
@@ -4,4 +4,5 @@
 use Test;
 use MT;
+use MT::Test;
 use MT::Util qw( encode_html decode_html wday_from_ts format_ts dirify
                  convert_high_ascii encode_xml decode_xml substr_wref
Index: /branches/release-40/t/10-filemgr.t
===================================================================
--- /branches/release-40/t/10-filemgr.t (revision 1098)
+++ /branches/release-40/t/10-filemgr.t (revision 2562)
@@ -7,4 +7,5 @@
 
 use MT;
+use MT::Test;
 use MT::FileMgr;