diff --git a/ext/chapterparse/test/test_integrate.rb b/ext/chapterparse/test/test_integrate.rb
index dd55aa613..36f79dc40 100755
--- a/ext/chapterparse/test/test_integrate.rb
+++ b/ext/chapterparse/test/test_integrate.rb
@@ -8,7 +8,7 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 $: << File.expand_path('../../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'chaptparser'
 require 'ext/chapterparse/src/writer'
diff --git a/ext/chapterparse/test/test_parser.rb b/ext/chapterparse/test/test_parser.rb
index 565e2a1ba..a8bee8bb8 100755
--- a/ext/chapterparse/test/test_parser.rb
+++ b/ext/chapterparse/test/test_parser.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'chaptparser'
 
diff --git a/ext/chapterparse/test/test_writer.rb b/ext/chapterparse/test/test_writer.rb
index 297e9cd0a..ece29c2d4 100755
--- a/ext/chapterparse/test/test_writer.rb
+++ b/ext/chapterparse/test/test_writer.rb
@@ -7,15 +7,14 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 $: << File.expand_path('../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'writer'
 
 module ODDB
 	module ChapterParse
 		class TestWriter <Minitest::Test
-      include FlexMock::TestCase
 			def setup
 				@writer = Writer.new
 			end
diff --git a/ext/export/test/test_csv_exporter.rb b/ext/export/test/test_csv_exporter.rb
index d099d3371..f36a4b5fb 100755
--- a/ext/export/test/test_csv_exporter.rb
+++ b/ext/export/test/test_csv_exporter.rb
@@ -7,20 +7,19 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 $: << File.expand_path('../../../test', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'csv_exporter'
 require 'model/analysis/group'
 require 'model/doctor'
 require 'stub/odba'
 require 'model/limitationtext'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'tempfile'
 
 module ODDB
 	module OdbaExporter
 		class TestCsvExporter <Minitest::Test
-      include FlexMock::TestCase
 			def setup
         dbi = flexmock('dbi', :dbi_args => ['dbi_args'])
         flexmock(ODBA.storage, 
diff --git a/ext/export/test/test_generics_xls.rb b/ext/export/test/test_generics_xls.rb
index c49a0009e..3bb587565 100755
--- a/ext/export/test/test_generics_xls.rb
+++ b/ext/export/test/test_generics_xls.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 $: << File.expand_path('../../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'spreadsheet'
 require 'generics_xls'
 require 'date'
@@ -15,7 +15,6 @@
 module ODDB
   module OdbaExporter
     class TestGenericXls <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @loggroup_swiss = LogGroup.new(:swissmedic_journal)
         @loggroup_swiss.create_log(Date.today)
diff --git a/ext/fiparse/test/fachinfo_pdf_test.rb b/ext/fiparse/test/fachinfo_pdf_test.rb
index 03ca081f5..0d5ddcd4a 100755
--- a/ext/fiparse/test/fachinfo_pdf_test.rb
+++ b/ext/fiparse/test/fachinfo_pdf_test.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path("../src", File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require	'fachinfo_pdf'
 require "yaml"
diff --git a/ext/fiparse/test/fiparse_test.rb b/ext/fiparse/test/fiparse_test.rb
index 28ecd3f7b..1079fec8c 100755
--- a/ext/fiparse/test/fiparse_test.rb
+++ b/ext/fiparse/test/fiparse_test.rb
@@ -4,7 +4,7 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path("../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fiparse'
 
diff --git a/ext/fiparse/test/indications_test.rb b/ext/fiparse/test/indications_test.rb
index 527244617..f0faa442d 100755
--- a/ext/fiparse/test/indications_test.rb
+++ b/ext/fiparse/test/indications_test.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'indications'
 
diff --git a/ext/fiparse/test/test_fachinfo_hpricot.rb b/ext/fiparse/test/test_fachinfo_hpricot.rb
index fbb84fcdf..f78dffa1c 100755
--- a/ext/fiparse/test/test_fachinfo_hpricot.rb
+++ b/ext/fiparse/test/test_fachinfo_hpricot.rb
@@ -10,14 +10,14 @@
 $: << File.expand_path('../../../test', File.dirname(__FILE__))
 $: << File.expand_path('../../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'plugin/refdata'
 require 'fachinfo_hpricot'
 require 'fiparse'
 require 'plugin/text_info'
 require 'stub/cgi'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	class FachinfoDocument
diff --git a/ext/fiparse/test/test_fachinfo_writer.rb b/ext/fiparse/test/test_fachinfo_writer.rb
index 1a70a1571..5bdaa501a 100755
--- a/ext/fiparse/test/test_fachinfo_writer.rb
+++ b/ext/fiparse/test/test_fachinfo_writer.rb
@@ -6,15 +6,14 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'fachinfo_writer'
 
 module ODDB
   module FiParse
     class TestFachinfoWriter <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @writer = ODDB::FiParse::FachinfoWriter.new
       end
diff --git a/ext/fiparse/test/test_fiwriter.rb b/ext/fiparse/test/test_fiwriter.rb
index 1350c9b00..377e63b99 100755
--- a/ext/fiparse/test/test_fiwriter.rb
+++ b/ext/fiparse/test/test_fiwriter.rb
@@ -6,16 +6,15 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'fiwriter'
 
 module ODDB
   module FiParse
 
 class TestWriter <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @writer = ODDB::FiParse::Writer.new
   end
diff --git a/ext/fiparse/test/test_patinfo_hpricot.rb b/ext/fiparse/test/test_patinfo_hpricot.rb
index e683bdf1b..7d61850fc 100755
--- a/ext/fiparse/test/test_patinfo_hpricot.rb
+++ b/ext/fiparse/test/test_patinfo_hpricot.rb
@@ -10,9 +10,9 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 $: << File.expand_path('../../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'patinfo_hpricot'
 require 'plugin/text_info'
 $: << File.expand_path('../../../test', File.dirname(__FILE__))
@@ -21,7 +21,6 @@
 module ODDB
   module FiParse
 class TestPatinfoHpricot <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @writer = PatinfoHpricot.new
   end
diff --git a/ext/fiparse/test/test_pseudo_fachinfo.rb b/ext/fiparse/test/test_pseudo_fachinfo.rb
index 951ef7268..f89accacc 100755
--- a/ext/fiparse/test/test_pseudo_fachinfo.rb
+++ b/ext/fiparse/test/test_pseudo_fachinfo.rb
@@ -10,14 +10,14 @@
 $: << File.expand_path('../../../test', File.dirname(__FILE__))
 $: << File.expand_path('../../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fachinfo_hpricot'
 require 'fiparse'
 require 'textinfo_pseudo_fachinfo'
 require 'plugin/text_info'
 require 'stub/cgi'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
   module FiParse
diff --git a/ext/fipdf/test/chapter_wrapper_test.rb b/ext/fipdf/test/chapter_wrapper_test.rb
index 922a11bb0..24262e60c 100755
--- a/ext/fipdf/test/chapter_wrapper_test.rb
+++ b/ext/fipdf/test/chapter_wrapper_test.rb
@@ -3,7 +3,7 @@
 
 $: << File.expand_path('../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'chapter_wrapper'
 
diff --git a/ext/fipdf/test/fachinfo_wrapper_test.rb b/ext/fipdf/test/fachinfo_wrapper_test.rb
index 90d2d6d03..edc921e0e 100755
--- a/ext/fipdf/test/fachinfo_wrapper_test.rb
+++ b/ext/fipdf/test/fachinfo_wrapper_test.rb
@@ -3,7 +3,7 @@
 
 $: << File.expand_path('../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fachinfo_wrapper'
 require 'delegate'
diff --git a/ext/fipdf/test/fachinfo_writer_test.rb b/ext/fipdf/test/fachinfo_writer_test.rb
index 09830ae87..4d796675b 100755
--- a/ext/fipdf/test/fachinfo_writer_test.rb
+++ b/ext/fipdf/test/fachinfo_writer_test.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fachinfo_writer'
 require 'model/text'
diff --git a/ext/fipdf/test/format_test.rb b/ext/fipdf/test/format_test.rb
index 63531a1f5..fcc26a999 100755
--- a/ext/fipdf/test/format_test.rb
+++ b/ext/fipdf/test/format_test.rb
@@ -3,7 +3,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/text'
 require 'format'
diff --git a/ext/fipdf/test/paragraph_wrapper_test.rb b/ext/fipdf/test/paragraph_wrapper_test.rb
index b629effaf..03888440a 100755
--- a/ext/fipdf/test/paragraph_wrapper_test.rb
+++ b/ext/fipdf/test/paragraph_wrapper_test.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'paragraph_wrapper'
 require 'model/text'
diff --git a/ext/fipdf/test/rules_test.rb b/ext/fipdf/test/rules_test.rb
index df96605ea..d68b05e2b 100755
--- a/ext/fipdf/test/rules_test.rb
+++ b/ext/fipdf/test/rules_test.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fachinfo_writer'
 require 'rules.rb'
diff --git a/ext/fipdf/test/section_wrapper_test.rb b/ext/fipdf/test/section_wrapper_test.rb
index 22c93c73b..c3b119289 100755
--- a/ext/fipdf/test/section_wrapper_test.rb
+++ b/ext/fipdf/test/section_wrapper_test.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'section_wrapper'
 require 'model/text'
diff --git a/ext/fipdf/test/substance_index_test.rb b/ext/fipdf/test/substance_index_test.rb
index a7938be5c..d220ea907 100755
--- a/ext/fipdf/test/substance_index_test.rb
+++ b/ext/fipdf/test/substance_index_test.rb
@@ -3,7 +3,7 @@
 
 $: << File.expand_path("../src/", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require "substance_index"
 
diff --git a/ext/meddata/test/session_test.rb b/ext/meddata/test/session_test.rb
index 222e641e3..60943e4ae 100755
--- a/ext/meddata/test/session_test.rb
+++ b/ext/meddata/test/session_test.rb
@@ -7,10 +7,10 @@
 	File.dirname(__FILE__))
 $: << File.expand_path("../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'meddata'
-require 'flexmock' 
+require 'flexmock/minitest' 
 
 module ODDB
 	module MedData
diff --git a/ext/meddata/test/test_drbsession.rb b/ext/meddata/test/test_drbsession.rb
index ef90a25cb..4e480d8f0 100755
--- a/ext/meddata/test/test_drbsession.rb
+++ b/ext/meddata/test/test_drbsession.rb
@@ -4,9 +4,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 $: << File.expand_path("../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'meddparser'
 require 'drbsession'
 require 'result'
@@ -16,7 +16,6 @@ module ODDB
   module MedData
 
 class TestDRbSession <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @drb = ODDB::MedData::DRbSession.new(:partner)
   end
diff --git a/ext/meddata/test/test_ean_factory.rb b/ext/meddata/test/test_ean_factory.rb
index 8ec61cb91..c98178f1f 100755
--- a/ext/meddata/test/test_ean_factory.rb
+++ b/ext/meddata/test/test_ean_factory.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
 require 'ean_factory'
-gem 'minitest'
+
 require 'minitest/autorun'
 
 module ODDB
diff --git a/ext/meddata/test/test_meddata.rb b/ext/meddata/test/test_meddata.rb
index 71e1ada26..917d49aaa 100755
--- a/ext/meddata/test/test_meddata.rb
+++ b/ext/meddata/test/test_meddata.rb
@@ -6,14 +6,13 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 $: << File.expand_path("../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'meddata'
 
 module ODDB
 	class TestMedData <Minitest::Test
-    include FlexMock::TestCase
 		def test__dispatch
 			str = MedData::Result
 			instance = str.new('bar', 'baz')
diff --git a/ext/meddata/test/test_meddparser.rb b/ext/meddata/test/test_meddparser.rb
index 5640d085b..b0faa6ec0 100755
--- a/ext/meddata/test/test_meddparser.rb
+++ b/ext/meddata/test/test_meddparser.rb
@@ -4,15 +4,14 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 $: << File.expand_path("../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'meddparser'
 
 module ODDB
   module MedData
     class TestFormatter <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @writer    = flexmock('writer')
         @formatter = ODDB::MedData::Formatter.new(@writer)
@@ -24,7 +23,6 @@ def test_push_tablecell
       end
     end
     class TestResultWriter <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @writer = ODDB::MedData::ResultWriter.new
       end
@@ -58,7 +56,6 @@ def test_send_flowing_data
       end
     end
     class TestDetailWriter <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @writer = ODDB::MedData::DetailWriter.new
       end
diff --git a/ext/meddata/test/test_result.rb b/ext/meddata/test/test_result.rb
index 607ddf93c..ea9a8b03c 100755
--- a/ext/meddata/test/test_result.rb
+++ b/ext/meddata/test/test_result.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 
 require 'result'
-gem 'minitest'
+
 require 'minitest/autorun'
 
 module ODDB
diff --git a/ext/meddata/test/test_session.rb b/ext/meddata/test/test_session.rb
index b1f3e002e..0922de3e7 100755
--- a/ext/meddata/test/test_session.rb
+++ b/ext/meddata/test/test_session.rb
@@ -3,9 +3,9 @@
 
 $: << File.expand_path('../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'meddata/src/session'
 
 module ODDB
@@ -21,7 +21,6 @@ def get(arg)
 module ODDB
   module MedData
     class TestSession <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @response = flexmock('response') do |r|
           r.should_receive(:[]).with('set-cookie').and_return('cookie_header')
@@ -162,7 +161,6 @@ def test_detail_html
     end
     
     class TestSessionException <Minitest::Test
-      include FlexMock::TestCase
       
       def stdout_null
         require 'tempfile'
diff --git a/ext/readonly/test/test_readonly_server.rb b/ext/readonly/test/test_readonly_server.rb
index e924c90a2..f512ea546 100755
--- a/ext/readonly/test/test_readonly_server.rb
+++ b/ext/readonly/test/test_readonly_server.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../..", File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'readonly_server'
 require 'model/atcclass'
 require 'model/company'
@@ -17,7 +17,6 @@
 module ODDB
   Currency = 'test'
   class TestReadonlyServer <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @serv = ReadonlyServer.new 
     end
diff --git a/ext/refdata/test/test_refdata.rb b/ext/refdata/test/test_refdata.rb
index d3259121b..59612083f 100755
--- a/ext/refdata/test/test_refdata.rb
+++ b/ext/refdata/test/test_refdata.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 $: << File.expand_path('../../../test', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 begin
   require 'pry'
 rescue LoadError
@@ -26,8 +26,6 @@ def stdout_null
         $stdout.close
         $stdout = STDERR
       end
-
-    include FlexMock::TestCase
     def setup
       TestHelpers.vcr_setup
       @@refdata_article ||= ODDB::Refdata::RefdataArticle.new
diff --git a/ext/swissindex/test/test_swissindex.rb b/ext/swissindex/test/test_swissindex.rb
index e22d71478..81851344f 100755
--- a/ext/swissindex/test/test_swissindex.rb
+++ b/ext/swissindex/test/test_swissindex.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'swissindex'
 
 module ODDB
@@ -23,7 +23,6 @@ class SwissindexMigel
     REFDATA_SERVER = RefDataServerStrub.new
   end
     class TestSwissindexPlugin <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @nonpharma =ODDB::Swissindex::SwissindexMigel.new
         @ssl  = flexmock('http', :verify_mode= => nil)
diff --git a/ext/swissreg/test/test_swissreg.rb b/ext/swissreg/test/test_swissreg.rb
index 6ccbeceaf..9d956ddb3 100755
--- a/ext/swissreg/test/test_swissreg.rb
+++ b/ext/swissreg/test/test_swissreg.rb
@@ -4,16 +4,15 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'swissreg'
 require 'writer'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
   module Swissreg
     class TestSession <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @session  = Session.new
         @base     = 'https://www.swissreg.ch'
diff --git a/test/data/csv/oddb.csv b/test/data/csv/oddb.csv
index 280f52da1..84ea348bc 100644
--- a/test/data/csv/oddb.csv
+++ b/test/data/csv/oddb.csv
@@ -1,3 +1,3 @@
 Typ;Reg.-Nr.;Packungsnummer;Swissmedic-Nr.;EAN-Code;BSV-Dossier;Pharmacode;Präparat;Galenische Form;Stärke;Packungsgrösse;Numerisch;EFP;PP;"Zulassungs&shy;inhaber";Kat.;SL;Aufnahme in SL;Limitation;Limitationspunkte;Limitationstext;LPPV;Reg.Dat.;Gültig bis;Deaktiviert;Exportprodukt;CAS Reg.Nr.;Generikum;Hat ein Generikum;SB;In Refdata nicht gelistet;Komplementärprodukt;Index Therapeuticus (BAG);Index Therapeuticus (Swissmedic);Betäubungsmittel;Impfstoff/Blutprodukt;In Erneuerung (Swissmedic
 #MGrp;123;description
-#Medi;123;123;123;barcode;;pharmacode;name_base;description;most_precise_dose;count de à measure;qty;;;company_name;ikscat;Nein;;;;;Ja;03.02.2011;03.02.2011;03.02.2011;export_flag;"";;Nein;;Ja;;index_therapeuticus;ith_swissmedic;Nein;Ja;Ja
+#Medi;123;123;123;barcode;bsv_dossier;pharmacode;name_base;description;most_precise_dose;count de à measure;qty;;;company_name;ikscat;Ja;03.02.2011;Ja;;;Ja;03.02.2011;03.02.2011;03.02.2011;export_flag;"";;Nein;;Ja;;index_therapeuticus;ith_swissmedic;Nein;Ja;Ja
diff --git a/test/data/csv/oddb.dat b/test/data/csv/oddb.dat
index a3a460437..d428cab6a 100644
--- a/test/data/csv/oddb.dat
+++ b/test/data/csv/oddb.dat
@@ -1 +1 @@
-1130000000name_base count de à measure                     000000000000100ikscatith_swi      barcode2
+1130000000name_base count de à measure                     000000000000200ikscatith_swi      barcode2
diff --git a/test/data/csv/oddb_with_migel.dat b/test/data/csv/oddb_with_migel.dat
index a3a460437..d428cab6a 100644
--- a/test/data/csv/oddb_with_migel.dat
+++ b/test/data/csv/oddb_with_migel.dat
@@ -1 +1 @@
-1130000000name_base count de à measure                     000000000000100ikscatith_swi      barcode2
+1130000000name_base count de à measure                     000000000000200ikscatith_swi      barcode2
diff --git a/test/stub/session.rb b/test/stub/session.rb
index 73057048b..ddc86e23b 100755
--- a/test/stub/session.rb
+++ b/test/stub/session.rb
@@ -3,7 +3,7 @@
 # Stub: Session -- oddb -- 22.10.2002 -- hwyss@ywesee.com 
 
 require 'util/session'
-require 'flexmock'
+require 'flexmock/minitest'
 module ODDB
   class StubApp
     attr_accessor :last_update, :currency, :unknown_user, :sponsor, :registrations
diff --git a/test/test_command/accept_orphan.rb b/test/test_command/accept_orphan.rb
index ed99f7d48..08bd963a5 100755
--- a/test/test_command/accept_orphan.rb
+++ b/test/test_command/accept_orphan.rb
@@ -7,14 +7,13 @@
 
 require 'state/global'
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'command/accept_orphan'
 
 module ODDB 
   class TestAcceptOrphan <Minitest::Test
-    include FlexMock::TestCase
     def setup
       old_info = flexmock('old_info', 
                           :empty?  => true,
diff --git a/test/test_command/merge.rb b/test/test_command/merge.rb
index 6ee559861..96683fd10 100755
--- a/test/test_command/merge.rb
+++ b/test/test_command/merge.rb
@@ -5,14 +5,13 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'command/merge'
 
 module ODDB 
   class TestMergeCommand <Minitest::Test
-    include FlexMock::TestCase
     def setup
       target = flexmock('target', 
                         :merge => 'merge',
diff --git a/test/test_command/replace_fachinfo.rb b/test/test_command/replace_fachinfo.rb
index 3fec7e64c..b9f98c45a 100755
--- a/test/test_command/replace_fachinfo.rb
+++ b/test/test_command/replace_fachinfo.rb
@@ -6,14 +6,13 @@
 
 #require 'state/global'
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'command/replace_fachinfo'
 
 module ODDB 
   class TestReplaceFachinfoCommand <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @fachinfo = flexmock('fachinfo', 
                            :empty?  => true,
diff --git a/test/test_custom/test_lookandfeelwrapper.rb b/test/test_custom/test_lookandfeelwrapper.rb
index 3248b500d..801706228 100755
--- a/test/test_custom/test_lookandfeelwrapper.rb
+++ b/test/test_custom/test_lookandfeelwrapper.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'custom/lookandfeelwrapper'
 
 module ODDB
@@ -28,7 +28,6 @@ def self.filter(pac_or_seq)
     RESULT_FILTER = self.method(:filter)
   end
   class TestLookandfeelWrapper <Minitest::Test
-    include FlexMock::TestCase
     def setup
       session = flexmock('session') do |s|
         s.should_receive(:flavor)
@@ -55,7 +54,6 @@ def test_result_filter
 
 module ODDB
   class TestLookandfeelEvidentia <Minitest::Test
-    include FlexMock::TestCase
     def create_env
       @session = flexmock('session') do |s|
         s.should_receive(:flavor)
@@ -75,7 +73,6 @@ def test_google_analytics_token_desitin
     end
   end
   class TestLookandfeelStandardResult <Minitest::Test
-    include FlexMock::TestCase
     def setup
       session = flexmock('session') do |s|
         s.should_receive(:flavor)
@@ -160,7 +157,6 @@ def test_result_list_components
   end
 
   class TestLookandfeelGenerika <Minitest::Test
-    include FlexMock::TestCase
     def setup
       session = flexmock('session') do |s|
         s.should_receive(:flavor)
@@ -182,7 +178,6 @@ def test_zones
   end
 
   class TestLookandfeelEvidentia <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @session = flexmock('session') do |s|
         s.should_receive(:flavor)
@@ -275,7 +270,6 @@ def test_result_list_components
   end
 
   class TestLookandfeelJustMedical <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @session = flexmock('session') do |s|
         s.should_receive(:flavor)
@@ -376,7 +370,6 @@ def test_result_list_components
   end
 
   class TestLookandfeelSwissmedic <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @session = flexmock('session') do |s|
         s.should_receive(:flavor)
@@ -399,7 +392,6 @@ def test_enabled__false
   end
 
   class TestLookandfeelOekk <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @session = flexmock('session') do |s|
         s.should_receive(:flavor)
@@ -470,7 +462,6 @@ def test_result_list_components
   end
 
   class TestLookandfeelMobile <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @session = flexmock('session') do |s|
         s.should_receive(:flavor)
@@ -538,7 +529,6 @@ def test_explain_result_components
   end
 
   class TestLookandfeelSwissMedInfo <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @session = flexmock('session') do |s|
         s.should_receive(:flavor)
@@ -612,7 +602,6 @@ def test_section_style
   end
 
   class TestLookandfeelComplementaryType <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @session = flexmock('session') do |s|
         s.should_receive(:flavor)
diff --git a/test/test_model/activeagent.rb b/test/test_model/activeagent.rb
index 97084533e..c2331efc5 100755
--- a/test/test_model/activeagent.rb
+++ b/test/test_model/activeagent.rb
@@ -7,10 +7,10 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/activeagent'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	class ActiveAgentCommon
@@ -72,7 +72,6 @@ class StubActiveAgentSequence
 end
 
 class TestActiveAgent <Minitest::Test
-  include FlexMock::TestCase
 	def setup
 		@substance_name = 'ACIDUM ACETYLSALICYLICUM'
 		@agent = ODDB::ActiveAgent.new(@substance_name)
diff --git a/test/test_model/address.rb b/test/test_model/address.rb
index a8b19b81a..8b8d0ed37 100755
--- a/test/test_model/address.rb
+++ b/test/test_model/address.rb
@@ -6,15 +6,14 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'stub/odba'
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/address'
 
 module ODDB
 	class TestAddress <Minitest::Test
-    include FlexMock::TestCase
 		def setup
 			@address = ODDB::Address.new
 		end
@@ -151,7 +150,6 @@ def test_compare
     end
 	end
   class TestAddress2 <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @address = ODDB::Address2.new
     end
@@ -220,7 +218,6 @@ class StubAddressObserver
     include AddressObserver
   end
   class TestAddressObserver <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @observer = ODDB::StubAddressObserver.new
     end
@@ -249,7 +246,6 @@ def test_ydim_location
     end
   end
   class TestAddressSuggestion <Minitest::Test
-    include FlexMock::TestCase
     def setup
       flexmock(ODBA.cache, :next_id => 123)
       @suggestion = ODDB::AddressSuggestion.new
diff --git a/test/test_model/address2.rb b/test/test_model/address2.rb
index 70e037329..cc75ef866 100755
--- a/test/test_model/address2.rb
+++ b/test/test_model/address2.rb
@@ -6,7 +6,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'stub/odba'
 require 'minitest/autorun'
 require 'model/address'
diff --git a/test/test_model/analysis/detail_info.rb b/test/test_model/analysis/detail_info.rb
index 669b67024..6d824c4ce 100755
--- a/test/test_model/analysis/detail_info.rb
+++ b/test/test_model/analysis/detail_info.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/analysis/detail_info'
 
 module ODDB
   module Analysis
 
 class TestDetailInfo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @model = ODDB::Analysis::DetailInfo.new('lab_key')
   end
diff --git a/test/test_model/analysis/group.rb b/test/test_model/analysis/group.rb
index f802e6462..bcae5ea7e 100755
--- a/test/test_model/analysis/group.rb
+++ b/test/test_model/analysis/group.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/analysis/group'
 
 module ODDB
   module Analysis
 
 class TestGroup <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @group = ODDB::Analysis::Group.new('groupcd')
   end
diff --git a/test/test_model/analysis/position.rb b/test/test_model/analysis/position.rb
index 2b8a11aaf..6f93a2a24 100755
--- a/test/test_model/analysis/position.rb
+++ b/test/test_model/analysis/position.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/analysis/position'
 
 module ODDB
   module Analysis
 
 class TestPosition <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @position = ODDB::Analysis::Position.new('poscd')
     group     = flexmock('group', :groupcd => 'groupcd')
diff --git a/test/test_model/atcclass.rb b/test/test_model/atcclass.rb
index 74f1b9ea8..9064bd794 100755
--- a/test/test_model/atcclass.rb
+++ b/test/test_model/atcclass.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/odba'
 require 'model/atcclass'
 require 'model/dose'
@@ -19,7 +19,6 @@ class AtcClass
 end
 
 class TestAtcClass <Minitest::Test
-  include FlexMock::TestCase
 	class StubSequence
 		attr_accessor :substances
 		def packages
diff --git a/test/test_model/atcnode.rb b/test/test_model/atcnode.rb
index 7b4d86812..f80eb09be 100755
--- a/test/test_model/atcnode.rb
+++ b/test/test_model/atcnode.rb
@@ -7,15 +7,14 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/atcclass'
 require 'model/atcnode'
 
 module ODDB
   class TestAtcNode <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @root = ODDB::AtcNode.new(nil)
       @atcN = ODDB::AtcClass.new('N')
diff --git a/test/test_model/commercial_form.rb b/test/test_model/commercial_form.rb
index 4ce41e312..8368720d8 100755
--- a/test/test_model/commercial_form.rb
+++ b/test/test_model/commercial_form.rb
@@ -4,14 +4,13 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/commercial_form'
 
 module ODDB
   class TestCommercialForm <Minitest::Test
-    include FlexMock::TestCase
     def setup
       flexmock(ODBA.cache, :next_id => 123)
       @form = ODDB::CommercialForm.new
diff --git a/test/test_model/company.rb b/test/test_model/company.rb
index dee6dcb2f..0bb02da01 100755
--- a/test/test_model/company.rb
+++ b/test/test_model/company.rb
@@ -7,9 +7,9 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/company'
 
 module ODDB
@@ -20,7 +20,6 @@ class Company
 end
 
 class TestCompany <Minitest::Test
-  include FlexMock::TestCase
 	class StubRegistration
 	end
 	class StubApp
diff --git a/test/test_model/comparison.rb b/test/test_model/comparison.rb
index e0d185f34..af575832b 100755
--- a/test/test_model/comparison.rb
+++ b/test/test_model/comparison.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'state/drugs/compare'
 require 'model/dose'
diff --git a/test/test_model/composition.rb b/test/test_model/composition.rb
index 524aaba3b..74b106401 100755
--- a/test/test_model/composition.rb
+++ b/test/test_model/composition.rb
@@ -5,15 +5,14 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/composition'
 require 'stub/odba'
 
 module ODDB
   class TestComposition <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @composition = ODDB::Composition.new
       @tst_name = 'substance_name'
diff --git a/test/test_model/doctor.rb b/test/test_model/doctor.rb
index 95a1b5a90..e484fa671 100755
--- a/test/test_model/doctor.rb
+++ b/test/test_model/doctor.rb
@@ -6,17 +6,16 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/doctor'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
   class Doctor
     public :adjust_types
   end
 	class TestDoctor <Minitest::Test
-    include FlexMock::TestCase
 		def setup
 			@doctor = Doctor.new
 		end
diff --git a/test/test_model/dose.rb b/test/test_model/dose.rb
index e0723e018..e07bb06cf 100755
--- a/test/test_model/dose.rb
+++ b/test/test_model/dose.rb
@@ -5,14 +5,13 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/dose'
 require 'util/quanty'
 
 class TestDose <Minitest::Test
-  include FlexMock::TestCase
 	def setup
 		@dose = ODDB::Dose.new('1,7', 'mL')
 	end
diff --git a/test/test_model/ean13.rb b/test/test_model/ean13.rb
index c6d1231cb..6878d89bd 100755
--- a/test/test_model/ean13.rb
+++ b/test/test_model/ean13.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/ean13'
 
diff --git a/test/test_model/epha_interactions.rb b/test/test_model/epha_interactions.rb
index e18850fcf..1c1bcd423 100755
--- a/test/test_model/epha_interactions.rb
+++ b/test/test_model/epha_interactions.rb
@@ -3,15 +3,14 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/epha_interaction'
 require 'stub/odba'
 
 module ODDB
   class TestEphaInteraction <Minitest::Test
-    include FlexMock::TestCase
     ATC_CODE_1 = 'N06AB06'
     ATC_CODE_2 = 'G03AA13'
 
diff --git a/test/test_model/fachinfo.rb b/test/test_model/fachinfo.rb
index 2ea49703f..2965ea0a0 100755
--- a/test/test_model/fachinfo.rb
+++ b/test/test_model/fachinfo.rb
@@ -7,9 +7,9 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/fachinfo'
 require 'model/text'
 require 'yaml'
@@ -22,7 +22,6 @@ class FachinfoDocument
     attr_accessor :registrations
   end
   class TestFachinfo <Minitest::Test
-    include FlexMock::TestCase
     class StubRegistration
       attr_accessor :company_name
       attr_accessor :generic_type
@@ -181,7 +180,6 @@ def test_unwanted_effect_text
     end
   end
   class TestFachinfoDocument <Minitest::Test
-    include FlexMock::TestCase
     def setup
       fachinfo = ODDB::FachinfoDocument2001.new
       fachinfo.composition = ODDB::Text::Chapter.new
diff --git a/test/test_model/feedback.rb b/test/test_model/feedback.rb
index e91e77d83..de6a5d898 100755
--- a/test/test_model/feedback.rb
+++ b/test/test_model/feedback.rb
@@ -6,14 +6,13 @@
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/feedback'
 
 module ODDB
 	class TestFeedback <Minitest::Test
-    include FlexMock::TestCase
 		def setup
 			@feedback = Feedback.new
 		end
diff --git a/test/test_model/feedback_observer.rb b/test/test_model/feedback_observer.rb
index 6e49d9aa4..b22ab553c 100755
--- a/test/test_model/feedback_observer.rb
+++ b/test/test_model/feedback_observer.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/feedback_observer'
 
 module ODDB
@@ -17,7 +17,6 @@ def initialize(feedbacks)
     end
   end
   class TestFeedbackObserver <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @feedback  = flexmock('feedback', :oid => 123)
       @feedbacks = [@feedback]
diff --git a/test/test_model/galenicform.rb b/test/test_model/galenicform.rb
index 683ec41fa..74b411890 100755
--- a/test/test_model/galenicform.rb
+++ b/test/test_model/galenicform.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/galenicform'
 
 module ODDB
@@ -17,7 +17,6 @@ class GalenicForm
     public :adjust_types, :sequences
   end
   class TestGalenicForm <Minitest::Test
-    include FlexMock::TestCase
     class StubGroup
       attr_reader :add_called, :remove_called
       def add(form)
diff --git a/test/test_model/galenicgroup.rb b/test/test_model/galenicgroup.rb
index 428143eec..a14b1551a 100755
--- a/test/test_model/galenicgroup.rb
+++ b/test/test_model/galenicgroup.rb
@@ -6,10 +6,10 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/galenicgroup'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	class GalenicGroup
diff --git a/test/test_model/genericgroup.rb b/test/test_model/genericgroup.rb
index 824d3ba52..b4ade66dc 100755
--- a/test/test_model/genericgroup.rb
+++ b/test/test_model/genericgroup.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/genericgroup'
 
diff --git a/test/test_model/hospital.rb b/test/test_model/hospital.rb
index 0b6832e6b..00df35887 100755
--- a/test/test_model/hospital.rb
+++ b/test/test_model/hospital.rb
@@ -5,14 +5,13 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/hospital'
 
 module ODDB
 	class TestHospital <Minitest::Test
-    include FlexMock::TestCase
 		def setup
 			@hospital = Hospital.new('12543')
 		end
diff --git a/test/test_model/index_therapeuticus.rb b/test/test_model/index_therapeuticus.rb
index 2d07fba39..a7172ea56 100755
--- a/test/test_model/index_therapeuticus.rb
+++ b/test/test_model/index_therapeuticus.rb
@@ -4,15 +4,14 @@
 
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/index_therapeuticus'
 
 
 module ODDB
   class TestIndexTherapeuticus <Minitest::Test
-    include FlexMock::TestCase
     def setup
       flexmock(ODBA.cache, :next_id => 123)
       @therapeuticus = ODDB::IndexTherapeuticus.new('code')
diff --git a/test/test_model/indication.rb b/test/test_model/indication.rb
index 81cb2661b..be5a9b346 100755
--- a/test/test_model/indication.rb
+++ b/test/test_model/indication.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/indication'
 
 module ODDB
@@ -16,7 +16,6 @@ class Indication
     attr_reader :registrations
   end
   class TestIndication <Minitest::Test
-    include FlexMock::TestCase
     class StubRegistration < ODBA::StorageStub
     end
     def setup
diff --git a/test/test_model/invoice.rb b/test/test_model/invoice.rb
index 34006bacc..816c292c8 100755
--- a/test/test_model/invoice.rb
+++ b/test/test_model/invoice.rb
@@ -6,14 +6,13 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/invoice'
 
 module ODDB
 	class TestInvoice <Minitest::Test
-    include FlexMock::TestCase
 		def setup
 			@invoice = ODDB::Invoice.new
 		end
diff --git a/test/test_model/invoice_observer.rb b/test/test_model/invoice_observer.rb
index 67bb562a4..9b87e42b9 100755
--- a/test/test_model/invoice_observer.rb
+++ b/test/test_model/invoice_observer.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/invoice_observer'
 require 'odba'
 
@@ -19,7 +19,6 @@ def odba_store
     end
   end
   class TestInvoiceObserver <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @observer = ODDB::StubInvoiceObserver.new
     end
diff --git a/test/test_model/orphan.rb b/test/test_model/orphan.rb
index 704ecf0fe..538b9182a 100755
--- a/test/test_model/orphan.rb
+++ b/test/test_model/orphan.rb
@@ -4,14 +4,13 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/orphan'
 
 module ODDB
   class TestOrphanedTextInfo <Minitest::Test
-    include FlexMock::TestCase
     def setup
       flexmock(ODBA.cache, :next_id => 123)
       @model = ODDB::OrphanedTextInfo.new
diff --git a/test/test_model/package.rb b/test/test_model/package.rb
index 06a206f09..7a3d0737f 100755
--- a/test/test_model/package.rb
+++ b/test/test_model/package.rb
@@ -9,10 +9,10 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/package'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
   class PackageCommon
@@ -89,7 +89,6 @@ def compositions
   end
 end
 class TestPackage <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @package = ODDB::Package.new('12')
     @package.sequence = StubPackageSequence.new
diff --git a/test/test_model/package_observer.rb b/test/test_model/package_observer.rb
index 9a9b8b0e0..3b2b574ab 100755
--- a/test/test_model/package_observer.rb
+++ b/test/test_model/package_observer.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/package_observer'
 require 'util/persistence'
 
@@ -17,7 +17,6 @@ class StubPackageObserver < StubSuper
     include PackageObserver
   end
   class TestPackageObserver <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @observer = ODDB::StubPackageObserver.new
     end
diff --git a/test/test_model/part.rb b/test/test_model/part.rb
index e0843bdfc..962f1b4f2 100755
--- a/test/test_model/part.rb
+++ b/test/test_model/part.rb
@@ -5,14 +5,13 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/part'
 
 module ODDB
   class TestPart <Minitest::Test
-    include FlexMock::TestCase
     def setup
       part = flexmock(ODBA.cache, :next_id => 123)
       @part = ODDB::Part.new
diff --git a/test/test_model/patent.rb b/test/test_model/patent.rb
index ef5f3cb9f..25c016202 100755
--- a/test/test_model/patent.rb
+++ b/test/test_model/patent.rb
@@ -4,14 +4,13 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/patent'
 
 module ODDB
   class TestPatent <Minitest::Test
-    include FlexMock::TestCase
     def setup
       flexmock(ODBA.cache, :next_id => 123)
       @model = ODDB::Patent.new
diff --git a/test/test_model/patinfo.rb b/test/test_model/patinfo.rb
index 8e026d0e9..c7fbcb2c4 100755
--- a/test/test_model/patinfo.rb
+++ b/test/test_model/patinfo.rb
@@ -8,9 +8,9 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/patinfo'
 
 module ODDB
@@ -20,7 +20,6 @@ class Patinfo
 end
 
 class TestPatinfo <Minitest::Test
-  include FlexMock::TestCase
 	class StubSequence < ODBA::StorageStub
 		include ODDB::Persistence
 		def patinfo=(patinfo)
diff --git a/test/test_model/pharmacy.rb b/test/test_model/pharmacy.rb
index 95f861875..5f90df5eb 100755
--- a/test/test_model/pharmacy.rb
+++ b/test/test_model/pharmacy.rb
@@ -5,14 +5,13 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/pharmacy'
 
 module ODDB
 	class TestPharmacy <Minitest::Test
-    include FlexMock::TestCase
 		SampleBA_Type =  ODDB::BA_type::BA_public_pharmacy
     Sample_Key    = '12543'
     Sample_Name   = 'Dr. pharm Max Mustermann'
diff --git a/test/test_model/prescription.rb b/test/test_model/prescription.rb
index 023dd1a5f..1e5500b8a 100755
--- a/test/test_model/prescription.rb
+++ b/test/test_model/prescription.rb
@@ -7,9 +7,9 @@
 $: << File.expand_path("..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/prescription'
 
 module ODDB
@@ -86,7 +86,6 @@ def test_pretty
 end
 
 class TestPrescription <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @prescription = ODDB::Prescription.create_example_prescription
   end
diff --git a/test/test_model/registration.rb b/test/test_model/registration.rb
index 26a4fdcde..749e8a5ac 100755
--- a/test/test_model/registration.rb
+++ b/test/test_model/registration.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/registration'
 require 'model/text'
 require 'model/fachinfo'
@@ -125,7 +125,6 @@ def remove_registration(reg)
   end
 end
 class TestRegistration <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @registration = ODDB::Registration.new('12345')
   end
diff --git a/test/test_model/registration_observer.rb b/test/test_model/registration_observer.rb
index a50bfd305..2498e80ff 100755
--- a/test/test_model/registration_observer.rb
+++ b/test/test_model/registration_observer.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/registration_observer'
 require 'odba'
 
@@ -17,7 +17,6 @@ class StubRegistrationObserver
   end
 
   class TestRegistrationObserver <Minitest::Test
-    include FlexMock::TestCase
     def setup
       flexmock(ODBA.cache, 
                :next_id => 123,
diff --git a/test/test_model/search_result.rb b/test/test_model/search_result.rb
index 4635fc044..cffcd9c63 100755
--- a/test/test_model/search_result.rb
+++ b/test/test_model/search_result.rb
@@ -5,14 +5,13 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/search_result'
 
 module ODDB
   class TestAtcFacade <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @result  = flexmock('result')
       @session = flexmock('session')
@@ -119,7 +118,6 @@ def test_sequences
   end
 
   class TestSearchResult <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @result = ODDB::SearchResult.new
     end
diff --git a/test/test_model/selectsubstance.rb b/test/test_model/selectsubstance.rb
index 2d95e15f1..4d81c7a9f 100755
--- a/test/test_model/selectsubstance.rb
+++ b/test/test_model/selectsubstance.rb
@@ -4,14 +4,13 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/selectsubstance'
 
 module ODDB
   class TestSelectSubstance <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @active_agent = flexmock('active_agent', :pointer => 'pointer')
       @substance = ODDB::SelectSubstance.new('user_input', 'selection', @active_agent)
diff --git a/test/test_model/sequence.rb b/test/test_model/sequence.rb
index 684d9897e..3375ed2eb 100755
--- a/test/test_model/sequence.rb
+++ b/test/test_model/sequence.rb
@@ -7,14 +7,14 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/sequence'
 require 'model/atcclass'
 require 'model/registration'
 require 'model/substance'
 require 'util/searchterms'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
   class SequenceCommon
@@ -94,7 +94,6 @@ def accepted!(*args)
   end
 end
 class TestSequence <Minitest::Test
-  include FlexMock::TestCase
   class StubPatinfo
     attr_accessor :oid
     attr_reader :added, :removed
diff --git a/test/test_model/sequence_observer.rb b/test/test_model/sequence_observer.rb
index 9f67fd8fb..a3ad60396 100755
--- a/test/test_model/sequence_observer.rb
+++ b/test/test_model/sequence_observer.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/sequence_observer'
 require 'util/persistence'
 
@@ -17,7 +17,6 @@ class StubSequenceObserver < StubSuper
     include SequenceObserver
   end
   class TestSequenceObserver <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @observer = ODDB::StubSequenceObserver.new
     end
diff --git a/test/test_model/slate.rb b/test/test_model/slate.rb
index 6b3abd1d6..1ff1205c7 100755
--- a/test/test_model/slate.rb
+++ b/test/test_model/slate.rb
@@ -4,15 +4,14 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/slate'
 
 
 module ODDB
   class TestSlate <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @model = ODDB::Slate.new('name')
     end
diff --git a/test/test_model/slentry.rb b/test/test_model/slentry.rb
index 45c4a594c..55c6024fc 100755
--- a/test/test_model/slentry.rb
+++ b/test/test_model/slentry.rb
@@ -6,7 +6,7 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/slentry'
 require 'model/text'
diff --git a/test/test_model/sponsor.rb b/test/test_model/sponsor.rb
index 7d58e2e4e..697c449c4 100755
--- a/test/test_model/sponsor.rb
+++ b/test/test_model/sponsor.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/sponsor'
 
 module ODDB
@@ -17,7 +17,6 @@ class Sponsor
     public :adjust_types
   end
   class TestSponsor <Minitest::Test
-    include FlexMock::TestCase
     class StubApp
       def company_by_name(name)
         'company_by_name'
diff --git a/test/test_model/substance.rb b/test/test_model/substance.rb
index 139d59632..701b55071 100755
--- a/test/test_model/substance.rb
+++ b/test/test_model/substance.rb
@@ -7,18 +7,17 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/substance'
 require 'util/searchterms'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
   class Substance
     attr_writer :sequences
   end
   class TestSubstance <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @substance = ODDB::Substance.new
       @substance.descriptions.store('lt', "Acidum Acetylsalicylicum")
diff --git a/test/test_model/text.rb b/test/test_model/text.rb
index fafc19cc1..57328125a 100755
--- a/test/test_model/text.rb
+++ b/test/test_model/text.rb
@@ -6,10 +6,10 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/text'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
   module Text
diff --git a/test/test_model/user.rb b/test/test_model/user.rb
index 51e6c89aa..252e11dc9 100755
--- a/test/test_model/user.rb
+++ b/test/test_model/user.rb
@@ -7,9 +7,9 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/user'
 require 'digest/md5'
 
@@ -18,7 +18,6 @@ class YusStub
     YUS_SERVER = FlexMock.new 'yus_server'
   end
   class TestUnknownUser <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @user = UnknownUser.new
     end
@@ -39,7 +38,6 @@ def test_valid
     end
   end
   class TestYusStub <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @stub = YusStub.new 'test@mail.ch'
       @session = flexmock 'yus-session'
@@ -65,7 +63,6 @@ def test_equal
     end
   end
   class TestYusUser <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @session = flexmock 'yus-session'
       @user = YusUser.new @session
@@ -246,7 +243,6 @@ def test_set_preferences
     end
   end
   class TestUserObserver <Minitest::Test
-    include FlexMock::TestCase
     class Observer
       attr_reader :saved
       include UserObserver
diff --git a/test/test_plugin/analysis.rb b/test/test_plugin/analysis.rb
index 21b3ba4f1..a32809cee 100755
--- a/test/test_plugin/analysis.rb
+++ b/test/test_plugin/analysis.rb
@@ -5,10 +5,10 @@
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 $: << File.expand_path('..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'minitest/unit'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/odba'
 require 'stub/oddbapp'
 require 'mechanize'
@@ -34,7 +34,6 @@ class AnalysisPlugin
   end
   class TestAnalysisPluginDownload <Minitest::Test
     @@today = Today
-    include FlexMock::TestCase
     def teardown
       ODBA.storage = nil
       super # to clean up FlexMock
@@ -74,8 +73,7 @@ def test_update
 
   class TestAnalysisPluginWithoutDownload <Minitest::Test
     @@today = Today
-    Download_file = File.expand_path(File.join(__FILE__, '../../data/xlsx/analysis_de_2014.10.14_small.xlsx')) 
-    include FlexMock::TestCase
+    Download_file = File.expand_path(File.join(__FILE__, '../../data/xlsx/analysis_de_2014.10.14_small.xlsx'))
     def teardown
       ODBA.storage = nil
       super # to clean up FlexMock
diff --git a/test/test_plugin/atc_less.rb b/test/test_plugin/atc_less.rb
index 377554404..b2d6bfaad 100755
--- a/test/test_plugin/atc_less.rb
+++ b/test/test_plugin/atc_less.rb
@@ -5,14 +5,13 @@
 $: << File.expand_path("..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/atc_less'
 
 module ODDB
   class TestAtc_lessPlugin <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @latest_xlsx = File.join(ODDB::Plugin::ARCHIVE_PATH, 'xls', 'Packungen-latest.xlsx')
       @latest_xml  = File.join(ODDB::Plugin::ARCHIVE_PATH, 'xml', 'XMLRefdataPharma-latest.xml')
diff --git a/test/test_plugin/bsv_xml.rb b/test/test_plugin/bsv_xml.rb
index 815624207..0d66a8a9a 100755
--- a/test/test_plugin/bsv_xml.rb
+++ b/test/test_plugin/bsv_xml.rb
@@ -8,11 +8,11 @@
 $: << File.expand_path("../..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'stub/odba'
 require 'plugin/bsv_xml'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/logfile'
 require 'ext/swissindex/src/swissindex'
 require 'ext/refdata/src/refdata'
@@ -27,7 +27,6 @@ class Package < PackageCommon
 
 module ODDB
   class TestListener <Minitest::Test
-    include FlexMock::TestCase
     def teardown
       ODBA.storage = nil
       super # to clean up FlexMock
@@ -83,7 +82,6 @@ def test_update_chapter
   end if RUN_ALL
 
   class TestGenericsListener <Minitest::Test
-    include FlexMock::TestCase
     def teardown
       ODBA.storage = nil
       super # to clean up FlexMock
@@ -123,7 +121,6 @@ def test_tag_end__else
   end if RUN_ALL
 
   class TestItCodesListener <Minitest::Test
-    include FlexMock::TestCase
     def teardown
       ODBA.storage = nil
       super # to clean up FlexMock
@@ -212,7 +209,6 @@ class PreparationsListener < Listener
   end
 
   class TestPreparationsListener <Minitest::Test
-    include FlexMock::TestCase
     def teardown
       ODBA.storage = nil
       super # to clean up FlexMock
@@ -660,7 +656,6 @@ def test_tag_end__error
   end  if RUN_ALL
 
   class TestBsvXmlPlugin2 <Minitest::Test
-    include FlexMock::TestCase
     def teardown
       ODBA.storage = nil
       super # to clean up FlexMock
@@ -977,7 +972,6 @@ class PackageCommon
   class Package < PackageCommon
   end
   class TestBsvXmlPlugin <Minitest::Test
-    include FlexMock::TestCase
     def teardown
       ODBA.storage = nil
       super # to clean up FlexMock
diff --git a/test/test_plugin/comarketing.rb b/test/test_plugin/comarketing.rb
index 4e45b41e7..e40bcaf84 100755
--- a/test/test_plugin/comarketing.rb
+++ b/test/test_plugin/comarketing.rb
@@ -6,14 +6,13 @@
 
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/comarketing'
 
 module ODDB
   class TestCoMarketingPluginWithFile <Minitest::Test
-    include FlexMock::TestCase
     TestIksnr = '40414' #  1 Pur-Rutin, Filmtabletten  55817 1 Venutabs, Filmtabletten
     def setup
       @@today = Date.new(2014,5,1)
@@ -72,7 +71,6 @@ def test_report_with_test_file
     end
   end
 	class TestCoMarketingPlugin <Minitest::Test
-    include FlexMock::TestCase
 		def setup
 			@app = flexmock('app')
 			@plugin = ODDB::CoMarketingPlugin.new(@app)
diff --git a/test/test_plugin/csv_export.rb b/test/test_plugin/csv_export.rb
index e5c33f090..085114069 100755
--- a/test/test_plugin/csv_export.rb
+++ b/test/test_plugin/csv_export.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path("..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'drb/drb'
 require 'plugin/plugin'
 require 'plugin/csv_export'
@@ -24,7 +24,6 @@
 
 module ODDB
   class TestCsvExportPlugin <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @app    = flexmock('app')
       @plugin = ODDB::CsvExportPlugin.new(@app)
diff --git a/test/test_plugin/divisibility.rb b/test/test_plugin/divisibility.rb
index 670136cd3..3ee09ef70 100755
--- a/test/test_plugin/divisibility.rb
+++ b/test/test_plugin/divisibility.rb
@@ -3,9 +3,9 @@
 # ODDB::TestDrugbankPlugin -- oddb.org -- 29.08.2012 -- yasaka@ywesee.com
 
 require 'pathname'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 
 root = Pathname.new(__FILE__).realpath.parent.parent.parent
 $: << root.join('test').join('test_plugin')
@@ -34,7 +34,6 @@ class DivisibilityPlugin < Plugin
 
 module ODDB
   class TestDivisibilityPlugin <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @app    = FlexMock.new 'app'
       @plugin = DivisibilityPlugin.new @app
diff --git a/test/test_plugin/doctors.rb b/test/test_plugin/doctors.rb
index f64d6511c..53045f8e5 100755
--- a/test/test_plugin/doctors.rb
+++ b/test/test_plugin/doctors.rb
@@ -6,14 +6,13 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/doctors'
 require 'tempfile'
 
 class TestDoctorPlugin <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @config = flexmock('config')
     @app    = flexmock('app', :config => @config)
diff --git a/test/test_plugin/dosing.rb b/test/test_plugin/dosing.rb
index d5740b86c..3ae62b2f2 100755
--- a/test/test_plugin/dosing.rb
+++ b/test/test_plugin/dosing.rb
@@ -3,9 +3,9 @@
 # ODDB::TestDosingPlugin -- oddb.org -- 26.06.2012 -- yasaka@ywesee.com
 
 require 'pathname'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 
 root = Pathname.new(__FILE__).realpath.parent.parent.parent
 $: << root.join('test').join('test_plugin')
@@ -26,7 +26,6 @@ def _index
 
 module ODDB
   class TestDosingPlugin <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @app = FlexMock.new 'app'
       @app.should_receive(:update).and_return do |pointer, hash|
diff --git a/test/test_plugin/download_invoicer.rb b/test/test_plugin/download_invoicer.rb
index 39a73b512..39c2a9091 100755
--- a/test/test_plugin/download_invoicer.rb
+++ b/test/test_plugin/download_invoicer.rb
@@ -6,15 +6,14 @@
 
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/download_invoicer'
 require 'model/invoice'
 
 module ODDB
 	class TestDownloadInvoicer <Minitest::Test
-    include FlexMock::TestCase
 		class FlexMock < ::FlexMock
 			#undef :type
 		end
diff --git a/test/test_plugin/drugbank.rb b/test/test_plugin/drugbank.rb
index 42c1382b4..71cab9dc6 100755
--- a/test/test_plugin/drugbank.rb
+++ b/test/test_plugin/drugbank.rb
@@ -3,9 +3,9 @@
 # ODDB::TestDrugbankPlugin -- oddb.org -- 25.06.2012 -- yasaka@ywesee.com
 
 require 'pathname'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 
 root = Pathname.new(__FILE__).realpath.parent.parent.parent
 $: << root.join('test').join('test_plugin')
@@ -26,7 +26,6 @@ def _search_with atc
 
 module ODDB
   class TestDrugbankPlugin <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @app = FlexMock.new 'app'
       @app.should_receive(:update).and_return do |pointer, hash|
diff --git a/test/test_plugin/epha_interactions.rb b/test/test_plugin/epha_interactions.rb
index e62e30d17..a0c30e4ee 100755
--- a/test/test_plugin/epha_interactions.rb
+++ b/test/test_plugin/epha_interactions.rb
@@ -4,11 +4,11 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'stub/odba'
 require 'fileutils'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/epha_interactions'
 require 'model/text'
 require 'model/atcclass'
@@ -152,7 +152,6 @@ def recount
     end
 
   class TestEphaInteractionPlugin <MiniTest::Unit::TestCase
-    include FlexMock::TestCase
     
     def setup
       @app = StubApp.new
diff --git a/test/test_plugin/evidentia_links.rb b/test/test_plugin/evidentia_links.rb
index 62b5470f0..328e4095a 100644
--- a/test/test_plugin/evidentia_links.rb
+++ b/test/test_plugin/evidentia_links.rb
@@ -4,10 +4,10 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'minitest/mock'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/odba'
 require 'fileutils'
 require 'plugin/evidentia_search_links'
@@ -29,7 +29,6 @@ def initialize
     end
   end
   class TestEvidentiaSearchLinksPlugin < Minitest::Test
-    include FlexMock::TestCase
   def setup
       @app = flexmock('stub_app', StubApp.new)
       @@datadir = File.expand_path '../data/csv/', File.dirname(__FILE__)
diff --git a/test/test_plugin/fachinfo_invoicer.rb b/test/test_plugin/fachinfo_invoicer.rb
index bc014b872..f56543391 100755
--- a/test/test_plugin/fachinfo_invoicer.rb
+++ b/test/test_plugin/fachinfo_invoicer.rb
@@ -5,16 +5,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/oddbconfig'
 require 'plugin/fachinfo_invoicer'
 require 'model/registration'
 
 module ODDB
   class TestFachinfoInvoicer  <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @app    = flexmock('app')
       @plugin = ODDB::FachinfoInvoicer.new(@app)
diff --git a/test/test_plugin/fipdf.rb b/test/test_plugin/fipdf.rb
index a5a71c4d7..15d9417b0 100755
--- a/test/test_plugin/fipdf.rb
+++ b/test/test_plugin/fipdf.rb
@@ -5,15 +5,14 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/fipdf'
 
 
 module ODDB
   class TestFiPDFExporter <Minitest::Test
-    include FlexMock::TestCase
     def setup
       fachinfo = flexmock('fachinfo')
       @app    = flexmock('app', :fachinfos => {'key' => fachinfo})
diff --git a/test/test_plugin/hospitals.rb b/test/test_plugin/hospitals.rb
index 440704643..370b80894 100755
--- a/test/test_plugin/hospitals.rb
+++ b/test/test_plugin/hospitals.rb
@@ -7,15 +7,14 @@
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 
 require 'plugin/hospitals'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	module MedData
 
 class TestHospitalPlugin <Minitest::Test
-  include FlexMock::TestCase
   def setup 
     @app = FlexMock.new("app")
     @plugin = ODDB::HospitalPlugin.new(@app)
diff --git a/test/test_plugin/info_invoicer.rb b/test/test_plugin/info_invoicer.rb
index e00163add..ad5465a58 100755
--- a/test/test_plugin/info_invoicer.rb
+++ b/test/test_plugin/info_invoicer.rb
@@ -5,16 +5,15 @@
 $: << File.expand_path("..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/info_invoicer'
 require 'date'
 require 'model/invoice'
 require 'yus/entity'
 
 class TestInfoInvoicer <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app      = flexmock('app')
     @invoicer = ODDB::InfoInvoicer.new(@app)
diff --git a/test/test_plugin/invoicer.rb b/test/test_plugin/invoicer.rb
index f8da21c5a..3cf8a2fd6 100755
--- a/test/test_plugin/invoicer.rb
+++ b/test/test_plugin/invoicer.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/invoicer'
 require 'util/persistence'
 require 'yus/entity'
@@ -16,7 +16,6 @@
 require 'util/today'
 
 class TestInvoicer <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app      = flexmock('app')
     @invoicer = ODDB::Invoicer.new(@app)
diff --git a/test/test_plugin/lppv.rb b/test/test_plugin/lppv.rb
index 8af9fbde1..ab7d48f1d 100755
--- a/test/test_plugin/lppv.rb
+++ b/test/test_plugin/lppv.rb
@@ -7,11 +7,11 @@
 $: << test_dir
 $: << File.expand_path("../../src/", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require "plugin/lppv"
 require "net/http"
-require 'flexmock'
+require 'flexmock/minitest'
 # require 'webmock/test_unit'
 require 'vcr'
 require 'pry'
@@ -19,7 +19,6 @@
 
 module ODDB
   class TestLppvPlugin <Minitest::Test
-    include FlexMock::TestCase
     class MockApp
       def initialize(packages)
         @packages = packages
diff --git a/test/test_plugin/medical_products.rb b/test/test_plugin/medical_products.rb
index 0c9d8d00c..395c33da8 100755
--- a/test/test_plugin/medical_products.rb
+++ b/test/test_plugin/medical_products.rb
@@ -4,11 +4,11 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'stub/odba'
 require 'fileutils'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/medical_products'
 require 'model/text'
 require 'model/atcclass'
@@ -152,7 +152,6 @@ class TestMedicalProductPlugin <MiniTest::Unit::TestCase
       @@datadir = File.expand_path '../../ext/fiparse/test/data/docx/', File.dirname(__FILE__)
       @@vardir = File.expand_path '../var', File.dirname(__FILE__)
     end
-    include FlexMock::TestCase
     
     def setup
       assert(File.directory?(@@datadir), "Directory #{@@datadir} must exist")
diff --git a/test/test_plugin/medreg_doctor.rb b/test/test_plugin/medreg_doctor.rb
index 5df32e7d3..3fbb9f769 100755
--- a/test/test_plugin/medreg_doctor.rb
+++ b/test/test_plugin/medreg_doctor.rb
@@ -6,10 +6,10 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'stub/odba'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/medreg_doctor'
 require 'tempfile'
 require 'ostruct'
@@ -19,7 +19,6 @@
 Minitest::Test.i_suck_and_my_tests_are_order_dependent!()
 
 class TestDoctorPlugin <Minitest::Test
-  include FlexMock::TestCase
   RunTestTakingLong = false
   def teardown
     ODBA.storage = nil
diff --git a/test/test_plugin/medreg_pharmacy.rb b/test/test_plugin/medreg_pharmacy.rb
index e8d22c88b..6def4d0fe 100755
--- a/test/test_plugin/medreg_pharmacy.rb
+++ b/test/test_plugin/medreg_pharmacy.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/odba'
 require 'plugin/medreg_pharmacy'
 require 'tempfile'
@@ -24,7 +24,6 @@ def initialize
   end
 end
 class TestCompanyPlugin <Minitest::Test
-  include FlexMock::TestCase
   Test_Companies_XLSX = File.expand_path(File.join(__FILE__, '../../data/xlsx/companies_20141014.xlsx'))
   def teardown
     ODBA.storage = nil
diff --git a/test/test_plugin/medwin.rb b/test/test_plugin/medwin.rb
index f41fea035..6ab2a1988 100755
--- a/test/test_plugin/medwin.rb
+++ b/test/test_plugin/medwin.rb
@@ -7,11 +7,11 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 $: << File.expand_path("../..", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'plugin/medwin'
 require 'util/html_parser'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'ext/meddata/src/meddata'
 
 module ODDB
@@ -28,7 +28,6 @@ class MedwinPackagePlugin < MedwinPlugin
 end
 
 class TestMedwinCompanyPlugin <Minitest::Test
-  include FlexMock::TestCase
 	class StubApp
 		attr_reader :pointers, :values, :companies
 		def initialize
@@ -193,7 +192,6 @@ def test_update_company__result_empty
 end
 
 class TestMedwinPackagePlugin <Minitest::Test
-  include FlexMock::TestCase
 	class StubSequence
 		attr_accessor :packages
 		def active?
diff --git a/test/test_plugin/narcotic.rb b/test/test_plugin/narcotic.rb
index 4f09f39cc..ac75c7ca6 100755
--- a/test/test_plugin/narcotic.rb
+++ b/test/test_plugin/narcotic.rb
@@ -7,15 +7,14 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'plugin/narcotic'
-require 'flexmock'
+require 'flexmock/minitest'
 
 
 module ODDB
 	class TestNarcoticPlugin <Minitest::Test
-    include FlexMock::TestCase
 		def setup
 			@app = flexmock('app')
 			@plugin = NarcoticPlugin.new(@app)
diff --git a/test/test_plugin/ouwerkerk.rb b/test/test_plugin/ouwerkerk.rb
index 7601fa68d..55c5dee2f 100755
--- a/test/test_plugin/ouwerkerk.rb
+++ b/test/test_plugin/ouwerkerk.rb
@@ -6,7 +6,7 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'plugin/ouwerkerk'
 require 'model/atcclass'
diff --git a/test/test_plugin/patinfo_invoicer.rb b/test/test_plugin/patinfo_invoicer.rb
index c67a30a1e..817ddb1ca 100755
--- a/test/test_plugin/patinfo_invoicer.rb
+++ b/test/test_plugin/patinfo_invoicer.rb
@@ -7,16 +7,15 @@
 $: << File.expand_path("..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/odba'
 require 'plugin/patinfo_invoicer'
 require 'model/invoice'
 
 module ODDB
 	class TestPatinfoInvoicer <Minitest::Test
-    include FlexMock::TestCase
 		class FlexMock < ::FlexMock
 			#undef :type
 		end
diff --git a/test/test_plugin/plugin.rb b/test/test_plugin/plugin.rb
index cd261ad5c..1167c5ed2 100755
--- a/test/test_plugin/plugin.rb
+++ b/test/test_plugin/plugin.rb
@@ -6,9 +6,9 @@
 #$: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/plugin'
 require 'fileutils'
 
@@ -22,7 +22,6 @@ class Session
   end
 
   class TestSessionStub <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @app     = flexmock('app', :get_currency_rate => 'get_currency_rate')
       @session = ODDB::Plugin::SessionStub.new(@app)
@@ -33,7 +32,6 @@ def test_get_currency_rate
   end
 
   class TestPlugin <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @app    = flexmock('app')
       @plugin = ODDB::Plugin.new(@app)
diff --git a/test/test_plugin/refdata.rb b/test/test_plugin/refdata.rb
index adddfb7b4..fe7d4079e 100755
--- a/test/test_plugin/refdata.rb
+++ b/test/test_plugin/refdata.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../..", File.dirname(__FILE__))
 $: << File.expand_path("../../test", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'ext/refdata/src/refdata'
 require 'plugin/refdata'
 require 'fileutils'
@@ -15,7 +15,6 @@
 
 module ODDB
   class TestLogging <Minitest::Test
-    include FlexMock::TestCase
     def setup
       ODDB::RefdataPlugin::Logging.flag = true
       TestHelpers.vcr_setup
@@ -88,7 +87,6 @@ class RefdataPlugin
   end
 
   class TestRefdataPlugin <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @update = flexmock('update', :barcode => 'barcode')
       @app = flexmock('app', :update => @update)
diff --git a/test/test_plugin/rss.rb b/test/test_plugin/rss.rb
index 46c1a8b77..627f79e1b 100755
--- a/test/test_plugin/rss.rb
+++ b/test/test_plugin/rss.rb
@@ -5,9 +5,9 @@
 
 require 'date'
 require 'pathname'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stringio'
 
 root = Pathname.new(__FILE__).realpath.parent.parent.parent
@@ -22,7 +22,6 @@ class RssPlugin < Plugin
     RSS_PATH = File.expand_path('../../data/rss', __FILE__)
   end
   class TestRssPlugin <Minitest::Test
-    include FlexMock::TestCase
     Section = '00135'
     def setup
       @current = flexmock('current', :valid_from => Time.local(2011,2,3))
diff --git a/test/test_plugin/swissindex.rb b/test/test_plugin/swissindex.rb
index 3d5091c20..92ffcff19 100755
--- a/test/test_plugin/swissindex.rb
+++ b/test/test_plugin/swissindex.rb
@@ -6,16 +6,15 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 $: << File.expand_path("../..", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'ext/swissindex/src/swissindex'
 require 'plugin/swissindex'
 require 'fileutils'
 
 module ODDB
   class TestLogging <Minitest::Test
-    include FlexMock::TestCase
     def setup
       ODDB::SwissindexPlugin::Logging.flag = true
     end
@@ -89,7 +88,6 @@ class SwissindexMigelPlugin
   end
 
   class TestSwissindexMigelPlugin <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @app = flexmock('app', :update => 'update')
       @plugin = ODDB::SwissindexMigelPlugin.new(@app)
diff --git a/test/test_plugin/swissmedic.rb b/test/test_plugin/swissmedic.rb
index 89636f9ec..cb4c1aa6a 100755
--- a/test/test_plugin/swissmedic.rb
+++ b/test/test_plugin/swissmedic.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path("..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'minitest/unit'
 require 'stub/odba'
@@ -14,7 +14,7 @@
 require 'model/registration'
 require 'model/sequence'
 require 'model/package'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'ostruct'
 require 'tempfile'
 require 'util/log'
@@ -47,7 +47,6 @@ class SwissmedicPlugin
       :deletes_packages
   end
    class SwissmedicPluginTest < Minitest::Test
-    include FlexMock::TestCase
     NAME_OFFSET = 2
     INDICATION_OFFSET = 18
     ROW_ASPIRIN = 5 # row in excel -1
diff --git a/test/test_plugin/swissmedic_xlsx.rb b/test/test_plugin/swissmedic_xlsx.rb
index 57ff6a28b..9719e5217 100755
--- a/test/test_plugin/swissmedic_xlsx.rb
+++ b/test/test_plugin/swissmedic_xlsx.rb
@@ -7,7 +7,7 @@
 $: << File.expand_path("..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'minitest/unit'
 require 'stub/odba'
@@ -18,7 +18,7 @@
 require 'model/package'
 require 'model/galenicgroup'
 require 'model/composition'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'ostruct'
 require 'tempfile'
 require 'util/log'
@@ -38,7 +38,6 @@ class FlexMock::TestUnitFrameworkAdapter
 module ODDB
 
   class SwissmedicPluginTestXLSX < Minitest::Test
-    include FlexMock::TestCase
 
     def setup
       ODDB::GalenicGroup.reset_oids
diff --git a/test/test_plugin/swissmedicjournal.rb b/test/test_plugin/swissmedicjournal.rb
index 1a529682e..6baac6a8b 100755
--- a/test/test_plugin/swissmedicjournal.rb
+++ b/test/test_plugin/swissmedicjournal.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/swissmedicjournal'
 
 class Object
@@ -15,7 +15,6 @@ class Object
 end
 module ODDB
   class TestSmjPlugin <Minitest::Test
-    include FlexMock::TestCase
     def setup
       sequence = flexmock('sequence', :pointer => 'pointer')
       @app = flexmock('app', 
diff --git a/test/test_plugin/swissreg.rb b/test/test_plugin/swissreg.rb
index 9ee5cd13f..fecfd2a7c 100755
--- a/test/test_plugin/swissreg.rb
+++ b/test/test_plugin/swissreg.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'drb'
 require 'plugin/swissreg'
 require 'uri'
 
 module ODDB
   class TestSwissregPlugin <Minitest::Test
-    include FlexMock::TestCase
 
     def stderr_null
       require 'tempfile'
diff --git a/test/test_plugin/text_info.rb b/test/test_plugin/text_info.rb
index eedf703a6..d7926150f 100755
--- a/test/test_plugin/text_info.rb
+++ b/test/test_plugin/text_info.rb
@@ -7,11 +7,11 @@
 require 'yaml'
 YAML::ENGINE.yamler = 'syck'
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'stub/oddbapp'
 require 'fileutils'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'flexmock/test_unit'
 require 'plugin/text_info'
 require 'model/text'
@@ -32,7 +32,6 @@ class TextInfoPlugin
   class TestTextInfoPlugin <MiniTest::Test
     @@datadir = File.expand_path '../data/html/text_info', File.dirname(__FILE__)
     @@vardir = File.expand_path '../var/', File.dirname(__FILE__)
-    include FlexMock::TestCase
     def setup
       super
       @app = flexmock 'application'
@@ -168,7 +167,6 @@ def test_true_news
   end if RUN_ALL
 
   class TestExtractMatchedName <MiniTest::Test
-    include FlexMock::TestCase
     Nr_FI_in_AIPS_test = 4
     Nr_PI_in_AIPS_test = 1
     def teardown
diff --git a/test/test_plugin/text_info_swissmedicinfo.rb b/test/test_plugin/text_info_swissmedicinfo.rb
index 5d559c7ac..106366d5e 100755
--- a/test/test_plugin/text_info_swissmedicinfo.rb
+++ b/test/test_plugin/text_info_swissmedicinfo.rb
@@ -4,10 +4,10 @@
 $: << File.expand_path("..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fileutils'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/odba'
 require 'stub/oddbapp'
 require 'stub/oddbapp'
@@ -37,7 +37,6 @@ def read_packages
   end
 
   class TestTextInfoChangeLogin <MiniTest::Test
-    include FlexMock::TestCase
     def setup
       super
     end # Fuer Problem mit fachinfo italic
@@ -61,7 +60,6 @@ def test_odba_store
 
 if RunAll
   class TestTextInfoPluginAipsMetaData <MiniTest::Test
-    include FlexMock::TestCase
     unless defined?(@@datadir)
       @@datadir = File.expand_path '../data/xml', File.dirname(__FILE__)
       @@vardir = File.expand_path '../var/', File.dirname(__FILE__)
@@ -190,7 +188,6 @@ class TestTextInfoPlugin <MiniTest::Test
       @@datadir = File.expand_path '../data/xml', File.dirname(__FILE__)
       @@vardir = File.expand_path '../var/', File.dirname(__FILE__)
     end
-    include FlexMock::TestCase
 
     def create(dateiname, content)
         FileUtils.makedirs(File.dirname(dateiname))
@@ -299,7 +296,6 @@ def @plugin.textinfo_swissmedicinfo_index
 
   end
   class TestTextInfoPluginChecks <MiniTest::Test
-    include FlexMock::TestCase
     def teardown
       FileUtils.rm_rf @@vardir
       ODBA.storage = nil
@@ -340,7 +336,6 @@ def setup
   end
 
   class TestTextInfoPlugin_iksnr <MiniTest::Test
-    include FlexMock::TestCase
     def test_get_iksnr_comprimes
       test_string = '59341 (comprimés filmés), 59342 (comprimés à mâcher), 59343 (granulé oral)'
       assert_equal(["59341", "59342", "59343" ], TextInfoPlugin::get_iksnrs_from_string(test_string))
@@ -403,7 +398,6 @@ def replace_constant(constant, temp)
       @@datadir = File.expand_path '../data/xml', File.dirname(__FILE__)
       @@vardir = File.expand_path '../var/', File.dirname(__FILE__)
     end
-    include FlexMock::TestCase
 
     def create(dateiname, content)
         FileUtils.makedirs(File.dirname(dateiname))
diff --git a/test/test_plugin/vaccines.rb b/test/test_plugin/vaccines.rb
index ea6315994..42cb786bb 100755
--- a/test/test_plugin/vaccines.rb
+++ b/test/test_plugin/vaccines.rb
@@ -5,10 +5,10 @@
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 $: << File.expand_path('..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'rubygems'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/vaccines'
 require 'stub/odba'
 
diff --git a/test/test_plugin/who.rb b/test/test_plugin/who.rb
index 675aa4809..7c50c93a2 100755
--- a/test/test_plugin/who.rb
+++ b/test/test_plugin/who.rb
@@ -5,15 +5,14 @@
 $: << File.expand_path("..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/who'
 
 module ODDB
   class WhoPlugin < Plugin
     class TestCodeHandler <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @handler = ODDB::WhoPlugin::CodeHandler.new
       end
@@ -31,7 +30,6 @@ def test_shift
   end
 
   class TestWhoPlugin <Minitest::Test
-    include FlexMock::TestCase
     def teardown
       super
     end
diff --git a/test/test_plugin/xls_export.rb b/test/test_plugin/xls_export.rb
index 25ee27e1d..e0b83d2dd 100755
--- a/test/test_plugin/xls_export.rb
+++ b/test/test_plugin/xls_export.rb
@@ -6,15 +6,14 @@
 #$: << File.expand_path("../..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'drb/drb'
 require 'plugin/xls_export'
 
 module ODDB
   class TestXlsExportPlugin <Minitest::Test
-    include FlexMock::TestCase
     def stderr_null
       require 'tempfile'
       $stderr = Tempfile.open('stderr')
@@ -73,7 +72,6 @@ class XlsExportPlugin < Plugin
     @@today = Date.new(2011,2,3)
   end
   class TestXlsExportPlugin <Minitest::Test
-    include FlexMock::TestCase
     def test_export_patents
       patent = flexmock('patent', :expiry_date => Date.new(2011,2,4))
       registration = flexmock('registration', 
diff --git a/test/test_plugin/yaml.rb b/test/test_plugin/yaml.rb
index 56169612b..1dd50009e 100755
--- a/test/test_plugin/yaml.rb
+++ b/test/test_plugin/yaml.rb
@@ -6,9 +6,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/yaml'
 require 'util/today'
 require 'util/logfile'
@@ -16,7 +16,6 @@
 module ODDB
   @@today = Date.new(2014,7,8)
   class TestYamlExporter <Minitest::Test
-    include FlexMock::TestCase
     def stderr_null
       require 'tempfile'
       $stderr = Tempfile.open('stderr')
diff --git a/test/test_plugin/ydim.rb b/test/test_plugin/ydim.rb
index fc1c29fe3..a3ce9e373 100755
--- a/test/test_plugin/ydim.rb
+++ b/test/test_plugin/ydim.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/ydim'
 require 'iconv'
 require 'tempfile'
@@ -26,7 +26,6 @@ def set_oid
 end
 
 class TestDebitorFacade <Minitest::Test
-  include FlexMock::TestCase
   
   # must setup a dummy id_dsa before running setup the first time
   home_id_dsa = File.join(File.expand_path('~'), '.ssh', 'id_dsa')
@@ -95,7 +94,6 @@ def test_missing_method__iconv_error
 
 module ODDB
   class TestYdimPlugin <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @facade = flexmock('facade')
       @app    = flexmock('app')
diff --git a/test/test_plugin/zanalysis.rb b/test/test_plugin/zanalysis.rb
index 79ea81288..3cb5234b8 100755
--- a/test/test_plugin/zanalysis.rb
+++ b/test/test_plugin/zanalysis.rb
@@ -4,14 +4,13 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'plugin/analysis'
 
 module ODDB
   class TestAnalysisPlugin <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @position = flexmock('position', :pointer => 'pointer')
       @analysis_group = flexmock('analysis_group', :position => @position)
diff --git a/test/test_plugin/zdoctor.rb b/test/test_plugin/zdoctor.rb
index 6da9ed322..bae56867c 100755
--- a/test/test_plugin/zdoctor.rb
+++ b/test/test_plugin/zdoctor.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'plugin/doctors'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'flexmock/test_unit'
 
 module ODDB
@@ -18,7 +18,6 @@ class DoctorPlugin < Plugin
       PARSER = FlexMock.new("PARSER") 
     end
 		class TestDoctorPlugin <Minitest::Test
-      include FlexMock::TestCase
 			def setup
         @config = flexmock('config', :config => 'config')
         @app = flexmock('application_setup', :config => @config) #, :doctor_by_origin => 'doctor_by_origin')
diff --git a/test/test_remote/package.rb b/test/test_remote/package.rb
index f4e37f5da..94129b067 100755
--- a/test/test_remote/package.rb
+++ b/test/test_remote/package.rb
@@ -4,7 +4,7 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'flexmock/test_unit'
 require 'remote/package'
@@ -13,7 +13,6 @@ module ODDB
   module Remote
 
 class Test <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @remote  = flexmock('remote', 
                         :comparable_size => 'comparable_size',
diff --git a/test/test_remote/sequence.rb b/test/test_remote/sequence.rb
index acd6b5cdf..957a545d1 100755
--- a/test/test_remote/sequence.rb
+++ b/test/test_remote/sequence.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'remote/sequence'
 
 module ODDB
   module Remote
 
 class TestSequence < ::Minitest::Test
-  include FlexMock::TestCase
   def setup
     atc       = flexmock('atc', :code => 'code')
     @remote   = flexmock('remote', :atc => atc)
diff --git a/test/test_state/admin/activeagent.rb b/test/test_state/admin/activeagent.rb
index eb3f19824..4fdd1c044 100755
--- a/test/test_state/admin/activeagent.rb
+++ b/test/test_state/admin/activeagent.rb
@@ -7,9 +7,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 require 'state/global'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/select'
 require 'define_empty_class'
 require 'state/admin/activeagent'
@@ -20,7 +20,6 @@ module State
 		module Admin
 
 class TestActiveAgentState <Minitest::Test
-  include FlexMock::TestCase
 	class StubSession
 		attr_accessor :user_input
 		def app
@@ -190,7 +189,6 @@ def test_substance_selection
 end
 
 class TestActiveAgent  <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @session = flexmock('session', :app => @app)
@@ -335,7 +333,6 @@ def test_update__else
 end
 
 class TestCompanyActiveAgent <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @session = flexmock('session', 
diff --git a/test/test_state/admin/address_suggestion.rb b/test/test_state/admin/address_suggestion.rb
index efe4309ef..51393a360 100755
--- a/test/test_state/admin/address_suggestion.rb
+++ b/test/test_state/admin/address_suggestion.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'htmlgrid/errormessage'
 require 'htmlgrid/select'
@@ -23,7 +23,6 @@ module State
     module Admin
 
 class TestAddressSuggestion <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     parent   = flexmock('parent', :email => 'email')
diff --git a/test/test_state/admin/admin.rb b/test/test_state/admin/admin.rb
index 1e907c3ce..a4908296e 100755
--- a/test/test_state/admin/admin.rb
+++ b/test/test_state/admin/admin.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/admin'
 
 module ODDB
@@ -22,7 +22,6 @@ def initialize(session, model)
 end
 
 class TestAdmin <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @session = flexmock('session')
     @model   = flexmock('model')
diff --git a/test/test_state/admin/assign_deprived_sequence.rb b/test/test_state/admin/assign_deprived_sequence.rb
index d34d99caf..4da22fa4f 100755
--- a/test/test_state/admin/assign_deprived_sequence.rb
+++ b/test/test_state/admin/assign_deprived_sequence.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/assign_deprived_sequence'
 require 'state/admin/patinfo_preview'
 
@@ -15,7 +15,6 @@ module State
 		module Admin
 
 class TestDeprivedSequenceFacade <Minitest::Test
-  include FlexMock::TestCase
   def setup
     registration = flexmock('registration')
     @sequence1   = flexmock('sequence1', :registration => registration)
@@ -53,7 +52,6 @@ def test_sequence
 end
 
 class TestAssignDeprivedSequence <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @sequence = flexmock('sequence')
     @app      = flexmock('app', :search_sequences => [@sequence]).by_default
diff --git a/test/test_state/admin/assign_fachinfo.rb b/test/test_state/admin/assign_fachinfo.rb
index f26b7ccef..3b7cb1570 100755
--- a/test/test_state/admin/assign_fachinfo.rb
+++ b/test/test_state/admin/assign_fachinfo.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 require 'state/global'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'state/admin/assign_fachinfo'
 
@@ -16,7 +16,6 @@ module State
 		module Admin
 
 class TestRegistrationFacade <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @registration   = flexmock('registration')
     @facade         = ODDB::State::Admin::AssignFachinfo::RegistrationFacade.new(@registration)
@@ -47,7 +46,6 @@ def test_registrations
 end
 
 class TestAssignFachinfo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @registration = flexmock('registration')
     sequence  = flexmock('sequence', :registration => @registration)
diff --git a/test/test_state/admin/assign_patinfo.rb b/test/test_state/admin/assign_patinfo.rb
index 47f441e8c..834e5a806 100755
--- a/test/test_state/admin/assign_patinfo.rb
+++ b/test/test_state/admin/assign_patinfo.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 #require 'htmlgrid/labeltext'
 require 'state/admin/assign_patinfo'
 
@@ -15,7 +15,6 @@ module State
     module Admine
 
 class TestAssignPatinfo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     match    = flexmock('match', :to_a => [':!registration,12345!sequence,1.'])
     pointer  = flexmock('pointer', :resolve => true, :match => match)
diff --git a/test/test_state/admin/atcclass.rb b/test/test_state/admin/atcclass.rb
index e1b2808d1..4be1e8cff 100755
--- a/test/test_state/admin/atcclass.rb
+++ b/test/test_state/admin/atcclass.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/atcclass'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Admin
 
 class TestAtcClass <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app', :update => 'update')
     @lnf     = flexmock('lookandfeel', 
diff --git a/test/test_state/admin/commercial_form.rb b/test/test_state/admin/commercial_form.rb
index 51bc1b4f4..6a7dad22a 100755
--- a/test/test_state/admin/commercial_form.rb
+++ b/test/test_state/admin/commercial_form.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/merge_commercial_form'
 require 'view/descriptionform'
 require 'htmlgrid/labeltext'
@@ -20,7 +20,6 @@ module State
     module Admin
 
 class TestCommercialForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/admin/companyuser.rb b/test/test_state/admin/companyuser.rb
index 69272f4aa..3dfd1ac6b 100755
--- a/test/test_state/admin/companyuser.rb
+++ b/test/test_state/admin/companyuser.rb
@@ -6,17 +6,16 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'state/global'
 require 'state/admin/companyuser'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	module State
 		module Admin
 class TestCompanyUserState <Minitest::Test
-  include FlexMock::TestCase
 	class StubSession
 		attr_accessor :user_input, :user
 		def user_input(*keys); end
@@ -64,7 +63,6 @@ def test_new_registration
 end
 
 class TestCompanyUser <Minitest::Test
-  include FlexMock::TestCase
   class StubSuper
     def resolve_state(pinter, type)
       'resolve_state'
diff --git a/test/test_state/admin/entities.rb b/test/test_state/admin/entities.rb
index 1cf56466c..bfb920e20 100755
--- a/test/test_state/admin/entities.rb
+++ b/test/test_state/admin/entities.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/entities'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Admin
 
 class TestEntities <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @model   = flexmock('model')
diff --git a/test/test_state/admin/entity.rb b/test/test_state/admin/entity.rb
index a3cf0d965..a95acfac2 100755
--- a/test/test_state/admin/entity.rb
+++ b/test/test_state/admin/entity.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 require 'state/global'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/entity'
 
 module ODDB
@@ -15,7 +15,6 @@ module State
     module Admin
 
 class TestEntity <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @yus_user = flexmock('yus_user', :yus_name => 'yus_name')
     yus_model = flexmock('yus_model', 
diff --git a/test/test_state/admin/fachinfoconfirm.rb b/test/test_state/admin/fachinfoconfirm.rb
index 622e96bb7..c0e04cf71 100755
--- a/test/test_state/admin/fachinfoconfirm.rb
+++ b/test/test_state/admin/fachinfoconfirm.rb
@@ -6,9 +6,9 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/fachinfoconfirm'
 require 'state/global'
 
@@ -22,7 +22,6 @@ class FachinfoConfirm < State::Admin::Global
 end
 
 class TestFachinfoConfirmState <Minitest::Test
-  include FlexMock::TestCase
 	class StubApp
 		attr_reader :update_pointers, :update_values
 		attr_reader :replace_iksnrs, :replace_pointers
@@ -251,7 +250,6 @@ def test_update2
 end
 
 class TestFachinfoConfirm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @registration = flexmock('registration', :iksnr  => 'iksnr')
     @app     = flexmock('app', :registration => @registration)
diff --git a/test/test_state/admin/galenicform.rb b/test/test_state/admin/galenicform.rb
index 61c2636f8..a15b297de 100755
--- a/test/test_state/admin/galenicform.rb
+++ b/test/test_state/admin/galenicform.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/galenicform'
 require 'util/language'
 
@@ -16,7 +16,6 @@ module State
 		module Admin
 
 class TestGalenicForm2 <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
@@ -52,7 +51,6 @@ def test_update
 end
 
 class	TestGalenicForm <Minitest::Test
-  include FlexMock::TestCase
 	class StubSession
 		attr_accessor :user_input
 		def app
@@ -77,7 +75,6 @@ def user_input(*keys)
 		end
 	end
 	class StubApp
-    include FlexMock::TestCase
     attr_accessor :galenic_forms
     attr_accessor :model
 		attr_reader :update_called
diff --git a/test/test_state/admin/galenicgroup.rb b/test/test_state/admin/galenicgroup.rb
index b4e9ee117..9842cb266 100755
--- a/test/test_state/admin/galenicgroup.rb
+++ b/test/test_state/admin/galenicgroup.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/galenicgroup'
 require 'state/admin/galenicgroup'
 require 'util/language'
@@ -22,7 +22,6 @@ class Global < SBSM::State
 		module Admin
 
 class TestGalenicGroup <Minitest::Test
-  include FlexMock::TestCase
 	class StubSession
 		attr_accessor :user_input
 		def app
diff --git a/test/test_state/admin/global.rb b/test/test_state/admin/global.rb
index fc4b5071c..0804ccee5 100755
--- a/test/test_state/admin/global.rb
+++ b/test/test_state/admin/global.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/global'
 require 'state/admin/global'
 
@@ -15,7 +15,6 @@ module State
     module Admin
 
 class TestGlobal <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/admin/indication.rb b/test/test_state/admin/indication.rb
index d50631a4c..444892941 100755
--- a/test/test_state/admin/indication.rb
+++ b/test/test_state/admin/indication.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/indication'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Admin
 
 class TestIndication <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app', :delete => 'delete')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/admin/indications.rb b/test/test_state/admin/indications.rb
index 0c79481bd..8ab4e7137 100755
--- a/test/test_state/admin/indications.rb
+++ b/test/test_state/admin/indications.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/indications'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Admin
 
 class TestIndications <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/admin/login.rb b/test/test_state/admin/login.rb
index da7bd848a..ff97145c7 100755
--- a/test/test_state/admin/login.rb
+++ b/test/test_state/admin/login.rb
@@ -6,12 +6,12 @@
 #$: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'state/admin/login'
 require 'state/global'
 require 'util/language'
-require 'flexmock'
+require 'flexmock/minitest'
 
 class StubResolvedRootState < ODDB::State::Global
 	include ODDB::State::Admin::Root
@@ -40,7 +40,6 @@ def request_path
 end
 
 class TestLoginMethods <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @session      = flexmock('session').by_default
     @loginmethods = ODDB::State::Admin::StubLoginMethods.new(@session)
@@ -110,7 +109,6 @@ def test_login__authentificationerror
 end
 
 class TestTransparentLogin <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @user     = flexmock('user', 
@@ -144,7 +142,6 @@ def test_login__authentificationerror
 end
 
 class TestTransparentLoginState <Minitest::Test
-  include FlexMock::TestCase
 	class StubSession
 		def app
 			@app ||= StubApp.new
diff --git a/test/test_state/admin/merge_commercial_form.rb b/test/test_state/admin/merge_commercial_form.rb
index 0a11de2a8..169542fba 100755
--- a/test/test_state/admin/merge_commercial_form.rb
+++ b/test/test_state/admin/merge_commercial_form.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/merge_commercial_form'
 require 'model/commercial_form'
 require 'view/admin/registration'
@@ -18,7 +18,6 @@ module State
     module Admin
 
 class TestMergeCommercialForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app', :merge_commercial_forms => 'merge_commercial_forms')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/admin/mergegalenicform.rb b/test/test_state/admin/mergegalenicform.rb
index d71dcac61..f2e0ab354 100755
--- a/test/test_state/admin/mergegalenicform.rb
+++ b/test/test_state/admin/mergegalenicform.rb
@@ -6,7 +6,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'command/merge'
 require 'define_empty_class'
diff --git a/test/test_state/admin/mergeindication.rb b/test/test_state/admin/mergeindication.rb
index 6b5548f8f..7b61308f1 100755
--- a/test/test_state/admin/mergeindication.rb
+++ b/test/test_state/admin/mergeindication.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/mergeindication'
 require 'state/admin/indication'
 
@@ -15,7 +15,6 @@ module State
     module Admin
 
 class TestMergeIndication <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app', 
                         :indication_by_text => 'target',
diff --git a/test/test_state/admin/orphaned_fachinfo_assign.rb b/test/test_state/admin/orphaned_fachinfo_assign.rb
index e5ee5b366..9b665aeae 100755
--- a/test/test_state/admin/orphaned_fachinfo_assign.rb
+++ b/test/test_state/admin/orphaned_fachinfo_assign.rb
@@ -15,9 +15,9 @@ class RootFachinfo < Fachinfo;end
 end
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'state/admin/orphaned_fachinfo_assign'
 require 'state/drugs/fachinfo'
@@ -27,7 +27,6 @@ module State
 		module Admin
 
 class TestOrphanedFachinfoFacade <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app    = flexmock('app')
     @facade = ODDB::State::Admin::OrphanedFachinfoAssign::OrphanedFachinfoFacade.new(@app)
@@ -43,7 +42,6 @@ def test_structural_ancestors__else
 end
 
 class TestOrphanedFachinfoAssign <Minitest::Test
-  include FlexMock::TestCase
   def setup
     sequence = flexmock('sequence', :registration => 'registration')
     @app     = flexmock('app', :search_sequences => [sequence]).by_default
diff --git a/test/test_state/admin/orphaned_fachinfos.rb b/test/test_state/admin/orphaned_fachinfos.rb
index 0ad92b9d6..532914a6b 100755
--- a/test/test_state/admin/orphaned_fachinfos.rb
+++ b/test/test_state/admin/orphaned_fachinfos.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/orphaned_fachinfos'
 
 module ODDB
@@ -15,7 +15,6 @@ module State
     module Admin
 
 class TestOrphanedFachinfos <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/admin/orphaned_patinfo.rb b/test/test_state/admin/orphaned_patinfo.rb
index fbb8be104..b6187c413 100755
--- a/test/test_state/admin/orphaned_patinfo.rb
+++ b/test/test_state/admin/orphaned_patinfo.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 require 'state/global'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/orphaned_patinfo'
 require 'util/pointerarray'
 
@@ -17,7 +17,6 @@ module State
     module Admin
 
 class TestOrphanedPatinfo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/admin/orphaned_patinfo_assign.rb b/test/test_state/admin/orphaned_patinfo_assign.rb
index 55ac974ad..17e46b7c7 100755
--- a/test/test_state/admin/orphaned_patinfo_assign.rb
+++ b/test/test_state/admin/orphaned_patinfo_assign.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'state/admin/orphaned_patinfo_assign'
 require 'state/admin/patinfo_preview'
@@ -16,7 +16,6 @@ module State
 		module Admin
 
 class TestOrphanedPatinfoFacade <Minitest::Test
-  include FlexMock::TestCase
   def setup
   end
   def test_structural_ancestors
@@ -35,7 +34,6 @@ def test_structural_ancestors__else
 end
 
 class TestOrphanedPatinfoAssign <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @sequence = flexmock('sequence')
     @app      = flexmock('app', :search_sequences => [@sequence]).by_default
diff --git a/test/test_state/admin/orphaned_patinfos.rb b/test/test_state/admin/orphaned_patinfos.rb
index c59e5cc50..4e1ca7c75 100755
--- a/test/test_state/admin/orphaned_patinfos.rb
+++ b/test/test_state/admin/orphaned_patinfos.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/orphaned_patinfos'
 
 
@@ -15,7 +15,6 @@ module State
     module Admin
 
 class TestOrphanedPatinfos <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/admin/package.rb b/test/test_state/admin/package.rb
index 205109c00..55fcc4013 100755
--- a/test/test_state/admin/package.rb
+++ b/test/test_state/admin/package.rb
@@ -5,10 +5,10 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'state/admin/package'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/global'
 require 'model/commercial_form'
 
@@ -28,7 +28,6 @@ def skeleton
     end
   end
 class TestPackage <Minitest::Test
-  include FlexMock::TestCase
   def setup
     package      = flexmock('package', :pointer => 'pointer')
     sequence     = flexmock('sequence', :package => package)
@@ -427,7 +426,6 @@ def test_new_item
 end
 
 class TestCompanyPackage <Minitest::Test
-  include FlexMock::TestCase
   def setup
     pointer = StubPointer.new
     @session = flexmock('session')
@@ -485,7 +483,6 @@ def test_update
 end
 
 class TestDeductiblePackage <Minitest::Test
-  include FlexMock::TestCase
   def test_update
     @session = flexmock('session', 
                         :user_input   => 'user_input',
diff --git a/test/test_state/admin/password_lost.rb b/test/test_state/admin/password_lost.rb
index 443333db9..92dad9838 100755
--- a/test/test_state/admin/password_lost.rb
+++ b/test/test_state/admin/password_lost.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/password_lost'
 require 'state/admin/confirm'
 require 'util/mail'
@@ -16,7 +16,6 @@ module State
     module Admin
 
 class TestPasswordLost <Minitest::Test
-  include FlexMock::TestCase
   def setup
     Util.configure_mail :test
     Util.clear_sent_mails
diff --git a/test/test_state/admin/password_reset.rb b/test/test_state/admin/password_reset.rb
index 381f9d1fd..15b6b8c48 100755
--- a/test/test_state/admin/password_reset.rb
+++ b/test/test_state/admin/password_reset.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/password_reset'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Admin
 
 class TestPasswordReset <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/admin/patent.rb b/test/test_state/admin/patent.rb
index 8eb48a569..fe2fcb8a8 100755
--- a/test/test_state/admin/patent.rb
+++ b/test/test_state/admin/patent.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/patent'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Admin
 
 class TestPatent <Minitest::Test
-  include FlexMock::TestCase
   def setup
     flexmock(SwissregPlugin).new_instances do |s|
       s.should_receive(:get_detail).and_return({'key' => 'value'})
@@ -37,7 +36,6 @@ def test_update
 end
 
 class TestCompanyPatent <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/admin/patinfo_deprived_sequences.rb b/test/test_state/admin/patinfo_deprived_sequences.rb
index d3e479d6f..0b57bab62 100755
--- a/test/test_state/admin/patinfo_deprived_sequences.rb
+++ b/test/test_state/admin/patinfo_deprived_sequences.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 require 'state/global'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/patinfo_deprived_sequences'
 
 module ODDB
@@ -15,7 +15,6 @@ module State
 		module Admin
 
 class TestPatinfoDeprivedSequences <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/admin/patinfo_stats.rb b/test/test_state/admin/patinfo_stats.rb
index 0b6aec621..57ad2a632 100755
--- a/test/test_state/admin/patinfo_stats.rb
+++ b/test/test_state/admin/patinfo_stats.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/patinfo_stats'
 
 
@@ -15,7 +15,6 @@ module ODDB
 	module State
 		module Admin
       class TestInvoiceItemFacade <Minitest::Test
-        include FlexMock::TestCase
         def test_initialize
           invoice_item = flexmock('invoice_item') do |item|
             item.should_receive(:time).and_return('time')
@@ -25,7 +24,6 @@ def test_initialize
         end
       end
       class TestSequenceFacade <Minitest::Test
-        include FlexMock::TestCase
         def setup
           sequence = flexmock('sequence') do |seq|
             seq.should_receive(:iksnr).and_return('iksnr')
@@ -53,7 +51,6 @@ def test_newest_date
         end
       end
       class TestCompanyFacade <Minitest::Test
-        include FlexMock::TestCase
         def setup
           @company = flexmock('company') do |comp|
             comp.should_receive(:name).and_return('name')
@@ -136,7 +133,6 @@ def setup_patinfo_stats_common
           end
       end
       class TestPatinfoStatsCommon <Minitest::Test
-        include FlexMock::TestCase
         include ODDB::State::Admin
         def test_init
           setup_patinfo_stats_common
@@ -146,7 +142,6 @@ def test_init
         end
       end
       class TestPatinfoStatsCompanyUser <Minitest::Test
-        include FlexMock::TestCase
         include ODDB::State::Admin
         def test_init
           setup_patinfo_stats_common
@@ -156,7 +151,6 @@ def test_init
         end
       end
       class TestPatinfoStats <Minitest::Test
-        include FlexMock::TestCase
         include ODDB::State::Admin
         def test_symbol
           setup_patinfo_stats_common
diff --git a/test/test_state/admin/powerlinkuser.rb b/test/test_state/admin/powerlinkuser.rb
index ae511f80a..cc1249d26 100755
--- a/test/test_state/admin/powerlinkuser.rb
+++ b/test/test_state/admin/powerlinkuser.rb
@@ -14,9 +14,9 @@ class RootFachinfo < Fachinfo; end
     end
   end
 end
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/powerlinkuser'
 require 'state/companies/fipi_overview'
 
@@ -33,7 +33,6 @@ def initialize(session, model)
 end
 
 class TestPowerLinkUser <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/admin/poweruser.rb b/test/test_state/admin/poweruser.rb
index e27b74c2d..2de7f62f9 100755
--- a/test/test_state/admin/poweruser.rb
+++ b/test/test_state/admin/poweruser.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/poweruser'
 
 module ODDB
@@ -28,7 +28,6 @@ def initialize(session, model)
 end
 
 class TestPowerUser <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/admin/registration.rb b/test/test_state/admin/registration.rb
index 7b6a8286d..5ea814539 100755
--- a/test/test_state/admin/registration.rb
+++ b/test/test_state/admin/registration.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 $: << File.expand_path("../../..", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/registration'
 require 'util/log'
 require 'model/registration'
@@ -26,7 +26,6 @@ module State
     module Admin
 
 class TestRegistration <Minitest::Test
-  include FlexMock::TestCase
   def setup 
     @pointer = flexmock('pointer', :+ => @pointer)
     @registration= flexmock('registration', 
@@ -287,7 +286,6 @@ def test_update__duplicate_iksnr
 end
 
 class TestCompanyRegistration <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @pointer = flexmock('pointer', :+ => @pointer)
     @registration= flexmock('registration', 
@@ -361,7 +359,6 @@ def test_update
 end
 
 class TestResellerRegistration <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :event_url => 'event_url')
diff --git a/test/test_state/admin/root.rb b/test/test_state/admin/root.rb
index 48e3a9255..763509a77 100755
--- a/test/test_state/admin/root.rb
+++ b/test/test_state/admin/root.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/init'
 require 'state/global'
 require 'util/persistence'
@@ -120,7 +120,6 @@ class Entity < ODDB::State::Admin::Global; end
   end
 end
 class TestODDBStateAdminRoot <Minitest::Test
-  include FlexMock::TestCase
   class StubState < ODDB::State::Admin::Global
     include ODDB::State::Admin::Root
   end
diff --git a/test/test_state/admin/selectindication.rb b/test/test_state/admin/selectindication.rb
index c66d72af7..9eb7d73a2 100755
--- a/test/test_state/admin/selectindication.rb
+++ b/test/test_state/admin/selectindication.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/selectindication'
 
 module ODDB
@@ -15,7 +15,6 @@ module Admin
 
 module SelectIndicationMethods
   class TestSelection <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @registration = flexmock('registration', :pointer => 'pointer')
       @selection = ODDB::State::Admin::SelectIndicationMethods::Selection.new('user_input', 'selection', @registration)
@@ -35,7 +34,6 @@ def test_new_indication
 end # SelectIndicationMethods
 
 class TestSelectIndication <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app        = flexmock('app', :update => 'update')
     @lnf        = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/admin/selectsubstance.rb b/test/test_state/admin/selectsubstance.rb
index f9c4f1d55..b62658b55 100755
--- a/test/test_state/admin/selectsubstance.rb
+++ b/test/test_state/admin/selectsubstance.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/selectsubstance'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Admin
 
 class TestSelectSubstance <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app', :update => 'update')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/admin/sequence.rb b/test/test_state/admin/sequence.rb
index 282943d92..5fd76bfa0 100755
--- a/test/test_state/admin/sequence.rb
+++ b/test/test_state/admin/sequence.rb
@@ -5,15 +5,14 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/sequence'
 require 'state/global'
 require 'util/mail'
 
-class TestResellerSequence <Minitest::Test  
-  include FlexMock::TestCase
+class TestResellerSequence <Minitest::Test
   def setup
     @lookandfeel = flexmock('lookandfeel')
     @session = flexmock('session') do |s|
@@ -221,7 +220,6 @@ def test_update
 end
 
 class TestSequence <Minitest::Test
-  include FlexMock::TestCase
   def setup
     ptr      = flexmock('ptr', :skeleton => 'skeleton')
     pointer      = flexmock('pointer', :+ => ptr)
@@ -721,7 +719,6 @@ def test_atc_request
 end
 
 class TestCompanySequence <Minitest::Test
-  include FlexMock::TestCase
   class StubPointer
     attr_writer :model
     def resolve(app)
diff --git a/test/test_state/admin/slentry.rb b/test/test_state/admin/slentry.rb
index 0601d170a..e280fb094 100755
--- a/test/test_state/admin/slentry.rb
+++ b/test/test_state/admin/slentry.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/slentry'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Admin
 
 class TestSlEntry <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app', :delete => 'delete')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
@@ -45,7 +44,6 @@ def test_update
 end
 
 class TestCompanySlEntry <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/admin/sponsor.rb b/test/test_state/admin/sponsor.rb
index 62701639a..c1216c369 100755
--- a/test/test_state/admin/sponsor.rb
+++ b/test/test_state/admin/sponsor.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/sponsor'
 require 'fileutils'
 
@@ -15,7 +15,6 @@ module State
 		module Admin
 
 class TestSponsor <Minitest::Test
-  include FlexMock::TestCase
   def setup
     company  = flexmock('company', :pointer => 'pointer')
     @app     = flexmock('app', :company_by_name => company)
diff --git a/test/test_state/admin/user.rb b/test/test_state/admin/user.rb
index c0d570534..2fa0077ab 100755
--- a/test/test_state/admin/user.rb
+++ b/test/test_state/admin/user.rb
@@ -14,9 +14,9 @@ class RootFachinfo < Fachinfo; end
   end
 end
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/user'
 require 'state/admin/logout'
 require 'state/drugs/fachinfo'
@@ -42,7 +42,6 @@ def new_fachinfo(registration)
   end
 end
 class TestUser <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @session = flexmock('session')
     @model   = flexmock('model')
diff --git a/test/test_state/admin/wait_for_fachinfo.rb b/test/test_state/admin/wait_for_fachinfo.rb
index b179b639c..823b21794 100755
--- a/test/test_state/admin/wait_for_fachinfo.rb
+++ b/test/test_state/admin/wait_for_fachinfo.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/admin/wait_for_fachinfo'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
 		module Admin
 
 class TestModel <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @model = ODDB::State::Admin::WaitForFachinfo::Model.new
   end
@@ -28,7 +27,6 @@ def test_pointer_descr
 end
 
 class TestWaitForFachinfo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/ajax/ddd_chart.rb b/test/test_state/ajax/ddd_chart.rb
index fa637d014..b8d26a409 100755
--- a/test/test_state/ajax/ddd_chart.rb
+++ b/test/test_state/ajax/ddd_chart.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'sbsm/state'
 require 'state/ajax/ddd_chart'
 
@@ -15,7 +15,6 @@ module State
     module Ajax
 
 class TestDDDChart <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @comparable = flexmock('comparable', 
diff --git a/test/test_state/ajax/ddd_price.rb b/test/test_state/ajax/ddd_price.rb
index c9708f238..a43b0e84d 100755
--- a/test/test_state/ajax/ddd_price.rb
+++ b/test/test_state/ajax/ddd_price.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'sbsm/state'
 require 'state/ajax/ddd_price'
 
@@ -15,7 +15,6 @@ module State
     module Ajax
 
 class TestDDDPrice <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @model   = flexmock('model')
diff --git a/test/test_state/ajax/global.rb b/test/test_state/ajax/global.rb
index 1cd2e444f..f58e00c8d 100755
--- a/test/test_state/ajax/global.rb
+++ b/test/test_state/ajax/global.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'sbsm/state'
 require 'state/ajax/global'
 
@@ -15,7 +15,6 @@ module State
     module Ajax
 
 class TestGlobal <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/ajax/matches.rb b/test/test_state/ajax/matches.rb
index d64400755..3d200fcf5 100755
--- a/test/test_state/ajax/matches.rb
+++ b/test/test_state/ajax/matches.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'odba'
 require 'sbsm/state'
 require 'state/ajax/matches'
@@ -16,7 +16,6 @@ module State
     module Ajax
 
 class TestMatches <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/ajax/swissmedic_cat.rb b/test/test_state/ajax/swissmedic_cat.rb
index 097f21537..436edc854 100755
--- a/test/test_state/ajax/swissmedic_cat.rb
+++ b/test/test_state/ajax/swissmedic_cat.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'sbsm/state'
 require 'util/persistence'
 require 'state/ajax/swissmedic_cat'
@@ -16,7 +16,6 @@ module State
     module Ajax
 
 class TestSwissmedicCat <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @package  = flexmock('package')
     sequence = flexmock('sequence', :package => @package)
diff --git a/test/test_state/all_zones.rb b/test/test_state/all_zones.rb
index fa38a1681..f0a1508ab 100755
--- a/test/test_state/all_zones.rb
+++ b/test/test_state/all_zones.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/all_zones'
 
 module ODDB 
@@ -28,7 +28,6 @@ def initialize(previous)
 end
 
 class TestAllZones <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @previous = flexmock('previous')
     @state = ODDB::State::StubAllZones.new(@previous)
diff --git a/test/test_state/analysis/alphabetical.rb b/test/test_state/analysis/alphabetical.rb
index 181f5c3ba..3174ef4ff 100755
--- a/test/test_state/analysis/alphabetical.rb
+++ b/test/test_state/analysis/alphabetical.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 #require 'state/global'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/interval'
 require 'view/resulttemplate'
 require 'state/analysis/alphabetical'
@@ -17,7 +17,6 @@ module State
     module Analysis
 
 class TestAlphabetical <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/analysis/global.rb b/test/test_state/analysis/global.rb
index 6a736db85..3574cbb06 100755
--- a/test/test_state/analysis/global.rb
+++ b/test/test_state/analysis/global.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 require 'state/global'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/welcomehead'
 require 'state/analysis/global'
 
@@ -16,7 +16,6 @@ module State
     module Analysis
 
 class TestGlobal <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/analysis/result.rb b/test/test_state/analysis/result.rb
index 90de1efb4..ee972c8b7 100755
--- a/test/test_state/analysis/result.rb
+++ b/test/test_state/analysis/result.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'state/analysis/result'
 
@@ -15,7 +15,6 @@ module State
     module Analysis
 
 class TestResult <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/companies/company.rb b/test/test_state/companies/company.rb
index dcd15ca2a..9696ef5c8 100755
--- a/test/test_state/companies/company.rb
+++ b/test/test_state/companies/company.rb
@@ -6,17 +6,16 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'state/companies/company'
 require 'state/global'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB 
 	module State
 		module Companies
 class TestRootCompanyState <Minitest::Test
-  include FlexMock::TestCase
 	class StubSession
 		attr_writer :user_input
 		attr_accessor :app
@@ -95,7 +94,6 @@ def test_update2
 	end
 end
 class TestUserCompanyState <Minitest::Test
-  include FlexMock::TestCase
 	class StubSession
 		attr_writer :user_input, :user_equiv
 		attr_accessor :app
@@ -216,7 +214,6 @@ def test_update3
 end
 
 class TestCompany <Minitest::Test
-  include FlexMock::TestCase
   def test_snapback_event
     @session = flexmock('session')
     @model   = flexmock('model', :name => 'name')
@@ -226,7 +223,6 @@ def test_snapback_event
 end
 
 class TestUserCompany <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @session = flexmock('session', :app => @app)
diff --git a/test/test_state/companies/companylist.rb b/test/test_state/companies/companylist.rb
index ed210cac3..bbd39474b 100755
--- a/test/test_state/companies/companylist.rb
+++ b/test/test_state/companies/companylist.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'define_empty_class'
 require 'state/companies/companylist'
 
@@ -25,7 +25,6 @@ def init
 end
 
 class TestCompanyListState <Minitest::Test
-  include FlexMock::TestCase
 	class StubSession
 		attr_accessor :user, :user_input
 		def app
@@ -147,7 +146,6 @@ def test_user_input
 end
 
 class TestCompanyResult <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
@@ -163,7 +161,6 @@ def test_init
 end
 
 class TestCompanyList2 <Minitest::Test
-  include FlexMock::TestCase
   def setup
     company  = flexmock('company', :listed? => nil)
     @app     = flexmock('app',
diff --git a/test/test_state/companies/fipi_overview.rb b/test/test_state/companies/fipi_overview.rb
index 4f4a910e3..baeee4cda 100755
--- a/test/test_state/companies/fipi_overview.rb
+++ b/test/test_state/companies/fipi_overview.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/companies/fipi_overview'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Companies
 
 class TestFiPiOverview <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/companies/global.rb b/test/test_state/companies/global.rb
index 083658b2a..88038b61b 100755
--- a/test/test_state/companies/global.rb
+++ b/test/test_state/companies/global.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/companies/company'
 
 module ODDB 
@@ -14,7 +14,6 @@ module State
     module Companies
 
 class TestGlobal <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/companies/mergecompanies.rb b/test/test_state/companies/mergecompanies.rb
index 6c1855f40..1686b44d7 100755
--- a/test/test_state/companies/mergecompanies.rb
+++ b/test/test_state/companies/mergecompanies.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'state/companies/mergecompanies'
 require 'model/registration'
diff --git a/test/test_state/doctors/doctor.rb b/test/test_state/doctors/doctor.rb
index ed39538f6..6d49ea68f 100755
--- a/test/test_state/doctors/doctor.rb
+++ b/test/test_state/doctors/doctor.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/welcomehead'
 require 'state/global'
 require 'state/doctors/doctor'
@@ -16,7 +16,6 @@ module State
     module Doctors
 
 class TestRootDoctor <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app', :update => 'update')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/doctors/doctorlist.rb b/test/test_state/doctors/doctorlist.rb
index 534a3df32..a802ccf35 100755
--- a/test/test_state/doctors/doctorlist.rb
+++ b/test/test_state/doctors/doctorlist.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/welcomehead'
 require 'state/doctors/doctorlist'
 
@@ -15,7 +15,6 @@ module State
     module Doctors
 
 class TestDoctorList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
@@ -34,7 +33,6 @@ def test_symbol
 end
 
 class TestDoctorResult <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/doctors/global.rb b/test/test_state/doctors/global.rb
index 853de78dd..babe5a5b1 100755
--- a/test/test_state/doctors/global.rb
+++ b/test/test_state/doctors/global.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/welcomehead'
 #require 'state/global'
 require 'state/doctors/global'
@@ -20,7 +20,6 @@ def initialize(session, model)
       end
 
 class TestGlobal <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/doctors/vcard.rb b/test/test_state/doctors/vcard.rb
index 9ab468f1f..b335d3a14 100755
--- a/test/test_state/doctors/vcard.rb
+++ b/test/test_state/doctors/vcard.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/welcomehead'
 require 'state/doctors/global'
 require 'state/doctors/vcard'
@@ -16,7 +16,6 @@ module State
     module Doctors
 
 class TestVCard <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @model   = flexmock('model')
diff --git a/test/test_state/drugs/compare.rb b/test/test_state/drugs/compare.rb
index 31f055d2f..402f33388 100755
--- a/test/test_state/drugs/compare.rb
+++ b/test/test_state/drugs/compare.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/compare'
 require 'view/http_404'
 
@@ -15,7 +15,6 @@ module State
 		module Drugs
 
 class TestPackageFacade <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @original = flexmock('original')
     @package  = flexmock('package')
@@ -82,7 +81,6 @@ def test_compare2
 end
 
 class TestComparison <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @package      = flexmock('package')
     flexmock(@package, :comparables => [@package])
@@ -113,7 +111,6 @@ def test_sort_by
 end
 
 class TestCompare <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @app     = flexmock('app')
diff --git a/test/test_state/drugs/ddd.rb b/test/test_state/drugs/ddd.rb
index 6fc98f06c..0617b7577 100755
--- a/test/test_state/drugs/ddd.rb
+++ b/test/test_state/drugs/ddd.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/ddd'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Drugs
 
 class TestDDD <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/drugs/ddd_price.rb b/test/test_state/drugs/ddd_price.rb
index daad693d1..6845b477c 100755
--- a/test/test_state/drugs/ddd_price.rb
+++ b/test/test_state/drugs/ddd_price.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/compare'
 require 'state/drugs/ddd_price'
 
@@ -15,7 +15,6 @@ module State
     module Drugs
 
 class TestDDDPrice <Minitest::Test
-  include FlexMock::TestCase
   def setup
     registration = flexmock('registration', :sequence => nil)
     @app     = flexmock('app', :registration => registration)
diff --git a/test/test_state/drugs/fachinfo.rb b/test/test_state/drugs/fachinfo.rb
index 4b1c8a197..fb1e6993c 100755
--- a/test/test_state/drugs/fachinfo.rb
+++ b/test/test_state/drugs/fachinfo.rb
@@ -20,9 +20,9 @@ class FachinfoChangelogs < State::Drugs::Global
   end
 end
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/fachinfo'
 
 module ODDB
@@ -30,7 +30,6 @@ module State
 		module Drugs
 
 class TestFachinfoChangelogs <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
@@ -48,7 +47,6 @@ def test_init
 end
 
 class TestFachinfo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
@@ -70,7 +68,6 @@ def test_allowed
 end
 
 class TestFachinfoPrint <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
@@ -85,7 +82,6 @@ def test_init
 end
 
 class TestRootFachinfo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
@@ -142,7 +138,6 @@ def test_update__fetch_block
 end
 
 class TestCompanyFachinfo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/drugs/fachinfos.rb b/test/test_state/drugs/fachinfos.rb
index a556ba539..246dfded2 100755
--- a/test/test_state/drugs/fachinfos.rb
+++ b/test/test_state/drugs/fachinfos.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resultfoot'
 require 'state/drugs/fachinfos'
 
@@ -16,7 +16,6 @@ module State
     module Drugs
 
 class TestFachinfos <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @fachinfo = flexmock('fachinfo', :registrations => ['registration'])
diff --git a/test/test_state/drugs/init.rb b/test/test_state/drugs/init.rb
index b4b408679..fd9a17e3c 100755
--- a/test/test_state/drugs/init.rb
+++ b/test/test_state/drugs/init.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/init'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Drugs
 
 class TestInit <Minitest::Test
-  include FlexMock::TestCase
   def setup
     revision = flexmock('revision', 
                         :year  => 2011,
diff --git a/test/test_state/drugs/limitationtexts.rb b/test/test_state/drugs/limitationtexts.rb
index 4ba46ebbd..5cb561778 100755
--- a/test/test_state/drugs/limitationtexts.rb
+++ b/test/test_state/drugs/limitationtexts.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resultfoot'
 require 'state/drugs/limitationtexts'
 
@@ -15,7 +15,6 @@ module State
     module Drugs
 
 class TestLimitationTexts <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/drugs/narcotics.rb b/test/test_state/drugs/narcotics.rb
index a5802dab6..5289ed837 100755
--- a/test/test_state/drugs/narcotics.rb
+++ b/test/test_state/drugs/narcotics.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/narcotics'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Drugs
 
 class TestNarcotics <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/drugs/package.rb b/test/test_state/drugs/package.rb
index b7b121595..12c278a0b 100755
--- a/test/test_state/drugs/package.rb
+++ b/test/test_state/drugs/package.rb
@@ -6,9 +6,9 @@
 
 #require 'state/global'
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/package'
 
 module ODDB
@@ -16,7 +16,6 @@ module State
     module Drugs
 
 class TestPackage <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/drugs/patinfo.rb b/test/test_state/drugs/patinfo.rb
index caa9945dc..73ae71247 100755
--- a/test/test_state/drugs/patinfo.rb
+++ b/test/test_state/drugs/patinfo.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/patinfo'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Drugs
 
 class TestPatinfo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/drugs/patinfos.rb b/test/test_state/drugs/patinfos.rb
index 6dd271a79..692667874 100755
--- a/test/test_state/drugs/patinfos.rb
+++ b/test/test_state/drugs/patinfos.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resultfoot'
 require 'state/drugs/patinfos'
 
@@ -15,7 +15,6 @@ module State
     module Drugs
 
 class TestPatinfos <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/drugs/payment_method.rb b/test/test_state/drugs/payment_method.rb
index 0001f75dd..ee2f64e24 100755
--- a/test/test_state/drugs/payment_method.rb
+++ b/test/test_state/drugs/payment_method.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/global'
 require 'state/drugs/payment_method'
 
@@ -15,7 +15,6 @@ module State
     module Drugs
 
 class TestPaymentMethod <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @user    = flexmock('user')
diff --git a/test/test_state/drugs/prescription.rb b/test/test_state/drugs/prescription.rb
index b215ab8af..37ee3d4be 100755
--- a/test/test_state/drugs/prescription.rb
+++ b/test/test_state/drugs/prescription.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/prescription'
 
 class StubPrescriptionSession
@@ -33,7 +33,6 @@ module ODDB
   module State
     module Drugs
 class TestPrescription <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @session = StubPrescriptionSession.new
     @session.event = :rezept
diff --git a/test/test_state/drugs/price_history.rb b/test/test_state/drugs/price_history.rb
index 2f10df289..b5d650f6b 100755
--- a/test/test_state/drugs/price_history.rb
+++ b/test/test_state/drugs/price_history.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/price_history'
 
 
@@ -15,7 +15,6 @@ module State
     module Drugs
 
 class TestPriceHistory <Minitest::Test
-  include FlexMock::TestCase
   def setup
     price    = flexmock('price', 
                         :valid_from => Time.local(2011,2,3),
diff --git a/test/test_state/drugs/recentregs.rb b/test/test_state/drugs/recentregs.rb
index 4b65f8bc7..8d567cd9e 100755
--- a/test/test_state/drugs/recentregs.rb
+++ b/test/test_state/drugs/recentregs.rb
@@ -13,9 +13,9 @@ class RecentRegs < ODDB::State::Drugs::Global
     end
   end
 end
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/recentregs'
 
 module ODDB
@@ -23,7 +23,6 @@ module State
     module Drugs
 
 class TestPackageMonth <Minitest::Test
-  include FlexMock::TestCase
   def setup
     galenic_form = flexmock('galenic_form', :language => 'language', :galenic_group => 'galenic_group')
     package = flexmock('package',
@@ -52,7 +51,6 @@ def test_package_count
   end
 end
 class TestRecentRegs <Minitest::Test
-  include FlexMock::TestCase
   def setup
     log_group = flexmock('log_group', 
                          :newest_date => Time.local(2011,2,3),
diff --git a/test/test_state/drugs/register_download.rb b/test/test_state/drugs/register_download.rb
index 8adbdecc4..ddd99eea4 100755
--- a/test/test_state/drugs/register_download.rb
+++ b/test/test_state/drugs/register_download.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 $: << File.expand_path("..", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/errormessage'
 require 'htmlgrid/select'
 require 'htmlgrid/list'
@@ -25,7 +25,6 @@ module State
     module Drugs
 
 class TestRegisterDownload <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @user    = flexmock('user', :creditable? => nil).by_default
@@ -60,7 +59,6 @@ def test_price
 end
 
 class TestRegisterInvoicedDownload <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app', 
                         :create => 'create',
diff --git a/test/test_state/drugs/sequences.rb b/test/test_state/drugs/sequences.rb
index f15d4d9a3..c986bebc0 100755
--- a/test/test_state/drugs/sequences.rb
+++ b/test/test_state/drugs/sequences.rb
@@ -14,9 +14,9 @@ class RootFachinfo < Fachinfo; end
   end
 end
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/drugs/fachinfo'
 
 module ODDB
@@ -24,7 +24,6 @@ module State
     module Drugs
 
 class TestSequences <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup => 'lookup',
diff --git a/test/test_state/drugs/test_result.rb b/test/test_state/drugs/test_result.rb
index 10ffa96f3..c85f3a225 100755
--- a/test/test_state/drugs/test_result.rb
+++ b/test/test_state/drugs/test_result.rb
@@ -7,11 +7,11 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'define_empty_class'
 require 'state/drugs/result'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	module State
@@ -89,7 +89,6 @@ def language
 end
 
 class TestResult <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :disabled? => nil)
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/drugs/vaccines.rb b/test/test_state/drugs/vaccines.rb
index a67c23512..39649beef 100755
--- a/test/test_state/drugs/vaccines.rb
+++ b/test/test_state/drugs/vaccines.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/global'
 require 'state/drugs/vaccines'
 
@@ -15,7 +15,6 @@ module State
     module Drugs
 
 class TestVaccines <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/feedbacks.rb b/test/test_state/feedbacks.rb
index 569399f45..f4c71cbb8 100755
--- a/test/test_state/feedbacks.rb
+++ b/test/test_state/feedbacks.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/resulttemplate'
 require 'view/latin1'
@@ -18,7 +18,6 @@ module State
     module Feedbacks
 
       class TestItemWrapper <Minitest::Test
-        include FlexMock::TestCase
         def setup
           @item    = flexmock('item')
           @wrapper = ODDB::State::Feedbacks::ItemWrapper.new(@item)
@@ -65,7 +64,6 @@ def initialize(session, model)
     end
     
     class TestFeedbacks <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @lnf     = flexmock('lookandfeel')
         @app     = flexmock('app', :update => 'update')
diff --git a/test/test_state/global.rb b/test/test_state/global.rb
index d6c785645..22198f232 100755
--- a/test/test_state/global.rb
+++ b/test/test_state/global.rb
@@ -8,12 +8,12 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'state/global'
 require 'util/language'
 require 'sbsm/state'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/user/yweseecontact'
 require 'state/user/register_download'
 require 'state/migel/result'
@@ -32,7 +32,6 @@ class Global < SBSM::State
 			attr_accessor :model
 		end
 		class TestGlobal <Minitest::Test
-      include FlexMock::TestCase
       class StubSession
 				attr_accessor :user_input, :request_path, :lookandfeel, :flavor, :doctors
         def search_doctor(oid)
diff --git a/test/test_state/hospitals/global.rb b/test/test_state/hospitals/global.rb
index c400c0fe1..2b644173f 100755
--- a/test/test_state/hospitals/global.rb
+++ b/test/test_state/hospitals/global.rb
@@ -6,9 +6,9 @@
 
 #require 'state/global'
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/welcomehead'
 require 'state/hospitals/global'
 
@@ -17,7 +17,6 @@ module State
     module Hospitals
 
 class TestGlobal <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/hospitals/hospital.rb b/test/test_state/hospitals/hospital.rb
index 429ce9dc7..0291b2b2d 100755
--- a/test/test_state/hospitals/hospital.rb
+++ b/test/test_state/hospitals/hospital.rb
@@ -6,9 +6,9 @@
 
 require 'state/global'
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/welcomehead'
 require 'state/hospitals/hospital'
 require 'state/hospitals/setpass'
@@ -18,7 +18,6 @@ module State
     module Hospitals
 
 class TestRootHospital <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @update  = flexmock('update', :user => 'user')
     @app     = flexmock('app', :update => @update)
diff --git a/test/test_state/hospitals/hospitallist.rb b/test/test_state/hospitals/hospitallist.rb
index b09a91979..15628187a 100755
--- a/test/test_state/hospitals/hospitallist.rb
+++ b/test/test_state/hospitals/hospitallist.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/companies/companylist'
 require 'state/hospitals/hospitallist'
 
@@ -15,7 +15,6 @@ module State
     module Hospitals
 
 class TestHospitalList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
@@ -31,7 +30,6 @@ def test_symbol
 end
 
 class TestHospitalResult <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/hospitals/vcard.rb b/test/test_state/hospitals/vcard.rb
index dd63b884a..575bee193 100755
--- a/test/test_state/hospitals/vcard.rb
+++ b/test/test_state/hospitals/vcard.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/welcomehead'
 require 'state/hospitals/global'
 require 'state/hospitals/vcard'
@@ -17,7 +17,6 @@ module State
     module Hospitals
 
 class TestVCard <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @model   = flexmock('model')
diff --git a/test/test_state/interactions/global.rb b/test/test_state/interactions/global.rb
index f46208961..bf208a0d4 100755
--- a/test/test_state/interactions/global.rb
+++ b/test/test_state/interactions/global.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/search'
 require 'state/interactions/global'
 
@@ -16,7 +16,6 @@ module State
     module Interactions
 
 class TestGlobal <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/interactions/result.rb b/test/test_state/interactions/result.rb
index 726e67b3f..3789c146f 100755
--- a/test/test_state/interactions/result.rb
+++ b/test/test_state/interactions/result.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/search'
 require 'view/resulttemplate'
 require 'state/interactions/result'
@@ -18,7 +18,6 @@ module State
     module Interactions
 
 class TestResult <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/limit.rb b/test/test_state/limit.rb
index c6db62378..ea3173d4f 100755
--- a/test/test_state/limit.rb
+++ b/test/test_state/limit.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/limit'
 
 module ODDB 
@@ -20,7 +20,6 @@ def initialize(session, model)
   end
 end
 class TestLimit <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/migel/alphabetical.rb b/test/test_state/migel/alphabetical.rb
index 28dc7c71f..1adbc43d4 100755
--- a/test/test_state/migel/alphabetical.rb
+++ b/test/test_state/migel/alphabetical.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/interval'
 require 'view/resulttemplate'
 require 'state/migel/alphabetical'
@@ -16,7 +16,6 @@ module State
     module Migel
 
 class TestAlphabetical <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/migel/global.rb b/test/test_state/migel/global.rb
index cd9f0d63b..002f89a1e 100755
--- a/test/test_state/migel/global.rb
+++ b/test/test_state/migel/global.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/welcomehead'
 require 'state/migel/global'
 
@@ -16,7 +16,6 @@ module State
     module Migel
 
 class TestGlobal <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/migel/items.rb b/test/test_state/migel/items.rb
index 7e61e92a0..95ee1fb33 100755
--- a/test/test_state/migel/items.rb
+++ b/test/test_state/migel/items.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/page_facade'
 require 'state/migel/items'
 
@@ -15,7 +15,6 @@ module State
     module Migel
 
 class TestItems <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/notify.rb b/test/test_state/notify.rb
index fb15cfc14..124b9bba4 100755
--- a/test/test_state/notify.rb
+++ b/test/test_state/notify.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/notify'
 require 'cgi'
 require 'view/resulttemplate'
@@ -18,7 +18,6 @@ module ODDB
 	module State
 
 class TestNotification <Minitest::Test
-  include FlexMock::TestCase
   def test_empty
     @notification = ODDB::State::Notify::Notification.new
     assert(@notification.empty?)
@@ -37,7 +36,6 @@ def initialize(session, model)
 end
 
 class TestNotify <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/page_facade.rb b/test/test_state/page_facade.rb
index f5f09aa3c..53c5d511b 100755
--- a/test/test_state/page_facade.rb
+++ b/test/test_state/page_facade.rb
@@ -5,15 +5,14 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/page_facade'
 
 module ODDB 
 	module State
 		class TestPageFacade <Minitest::Test
-      include FlexMock::TestCase
 			def setup
 				@page = State::PageFacade.new(7)
         @page.model = flexmock('model', :missing => 'missing')
@@ -45,7 +44,6 @@ def test_respond_to
 		end
 
     class TestOffsetPageFacade <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @facade  = ODDB::State::OffsetPageFacade.new(1)
         @facade.offset = 10
@@ -63,7 +61,6 @@ def init
     end
     class StubOffsetPaging < StubSuper
       include ODDB::State::OffsetPaging
-      include FlexMock::TestCase
       def initialize
         @session = flexmock('session', :user_input => 0)
       end
@@ -76,7 +73,6 @@ def load_model
     end
 
     class TestOffsetPaging <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @paging = ODDB::State::StubOffsetPaging.new
       end
diff --git a/test/test_state/paypal/checkout.rb b/test/test_state/paypal/checkout.rb
index f4ad97e72..866bdfde1 100755
--- a/test/test_state/paypal/checkout.rb
+++ b/test/test_state/paypal/checkout.rb
@@ -13,9 +13,9 @@ module Checkout
   end
 end
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/paypal/checkout'
 
 module ODDB
@@ -43,7 +43,6 @@ module State
 		module PayPal
 
 class TestStubCheckout <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app      = flexmock('app')
     @session  = flexmock('session', :app => @app)
diff --git a/test/test_state/paypal/return.rb b/test/test_state/paypal/return.rb
index cf2de4fe3..8e8a74a04 100755
--- a/test/test_state/paypal/return.rb
+++ b/test/test_state/paypal/return.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/paypal/return'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module PayPal
 
 class TestReturn <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf, :user => 'user')
diff --git a/test/test_state/pharmacies/pharmacy.rb b/test/test_state/pharmacies/pharmacy.rb
index b806526ff..569db92ec 100755
--- a/test/test_state/pharmacies/pharmacy.rb
+++ b/test/test_state/pharmacies/pharmacy.rb
@@ -5,9 +5,9 @@
 
 require 'state/global'
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/welcomehead'
 require 'state/pharmacies/setpass'
 require 'state/pharmacies/pharmacy'
@@ -17,7 +17,6 @@ module State
     module Pharmacies
 
 class TestRootPharmacy <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @update  = flexmock('update', :user => 'user')
     @app     = flexmock('app', :update => @update)
diff --git a/test/test_state/rss/passthru.rb b/test/test_state/rss/passthru.rb
index 9c54d7de1..9dfae1406 100755
--- a/test/test_state/rss/passthru.rb
+++ b/test/test_state/rss/passthru.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/oddbconfig'
 require 'state/rss/passthru'
 
@@ -15,7 +15,6 @@ module State
     module Rss
 
 class TestPassThru <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_state/setpass.rb b/test/test_state/setpass.rb
index 276a99f14..f6e2cdd12 100755
--- a/test/test_state/setpass.rb
+++ b/test/test_state/setpass.rb
@@ -6,9 +6,9 @@
 
 require 'state/global'
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/setpass'
 
 module ODDB 
@@ -28,7 +28,6 @@ def user_input(keys1, keys2)
 end
 
 class TestSetPass <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app', :update => 'update').by_default
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/substances/result.rb b/test/test_state/substances/result.rb
index dd0d72cc8..afbd74e53 100755
--- a/test/test_state/substances/result.rb
+++ b/test/test_state/substances/result.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/substances/result'
 
 module ODDB
@@ -14,7 +14,6 @@ module State
     module Substances
 
 class TestResult <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/substances/selectsubstance.rb b/test/test_state/substances/selectsubstance.rb
index 18467afcd..80bd8550e 100755
--- a/test/test_state/substances/selectsubstance.rb
+++ b/test/test_state/substances/selectsubstance.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/inputradio'
 require 'view/search'
 require 'state/substances/selectsubstance'
@@ -16,7 +16,6 @@ module State
     module Substances
 
 class TestSelectSubstance <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app', :merge_substances => 'merge_substances')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_state/substances/substance.rb b/test/test_state/substances/substance.rb
index 0068035e6..3c1d2d926 100755
--- a/test/test_state/substances/substance.rb
+++ b/test/test_state/substances/substance.rb
@@ -14,18 +14,17 @@ class PublicTemplate < HtmlGrid::Template; end
     class Search < View::PublicTemplate; end
   end
 end
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'state/substances/substance'
 require 'state/admin/root'
 require 'model/substance'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	module State
 		module Substances
 class TestSubstanceState <Minitest::Test
-  include FlexMock::TestCase
 	def setup
     @session = flexmock('session')
     @model = flexmock('model')
diff --git a/test/test_state/substances/substances.rb b/test/test_state/substances/substances.rb
index 663e9add7..8d49383ea 100755
--- a/test/test_state/substances/substances.rb
+++ b/test/test_state/substances/substances.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/search'
 require 'state/substances/substances'
 
@@ -16,7 +16,6 @@ module State
     module Sustances
 
 class TestSubstances <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/suggest_address.rb b/test/test_state/suggest_address.rb
index d480c251e..edbf8dd9e 100755
--- a/test/test_state/suggest_address.rb
+++ b/test/test_state/suggest_address.rb
@@ -6,9 +6,9 @@
 
 require 'state/global'
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/suggest_address'
 require 'util/mail'
 
@@ -16,7 +16,6 @@ module ODDB
 	module State
 
 class TestSuggestAddress <Minitest::Test
-  include FlexMock::TestCase
   def setup
     Util.configure_mail :test
     Util.clear_sent_mails
diff --git a/test/test_state/user/contributor.rb b/test/test_state/user/contributor.rb
index 2e303aac0..cf0fb206c 100755
--- a/test/test_state/user/contributor.rb
+++ b/test/test_state/user/contributor.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/user/contributor'
 
 module ODDB
@@ -30,7 +30,6 @@ def initialize(session, model)
 end
 
 class TestContributor <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     object   = flexmock('object', :pointer => 'pointer')
diff --git a/test/test_state/user/download.rb b/test/test_state/user/download.rb
index d7cb8f194..107bb21d2 100755
--- a/test/test_state/user/download.rb
+++ b/test/test_state/user/download.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'htmlgrid/select'
 require 'state/user/download'
@@ -17,7 +17,6 @@ module State
     module User
 
 class TestDownload <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/user/download_export.rb b/test/test_state/user/download_export.rb
index 84e6365ac..6885b7846 100755
--- a/test/test_state/user/download_export.rb
+++ b/test/test_state/user/download_export.rb
@@ -7,7 +7,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'define_empty_class'
 require 'htmlgrid/select'
diff --git a/test/test_state/user/fipi_offer_input.rb b/test/test_state/user/fipi_offer_input.rb
index 799fa8532..8605a312e 100755
--- a/test/test_state/user/fipi_offer_input.rb
+++ b/test/test_state/user/fipi_offer_input.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/user/fipi_offer_input'
 require 'htmlgrid/select'
 require 'state/user/fipi_offer_confirm'
@@ -17,7 +17,6 @@ module State
 		module User
 
 class TestFiPiOffer <Minitest::Test
-  include FlexMock::TestCase
 	def setup
 		@offer = ODDB::State::User::FiPiOfferInput::FiPiOffer.new
 	end
@@ -101,7 +100,6 @@ def test_calculate_pi_charge
 end
 
 class TestFiPiOfferInput <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/user/mailinglist.rb b/test/test_state/user/mailinglist.rb
index f81c8ded8..ef71f9f84 100755
--- a/test/test_state/user/mailinglist.rb
+++ b/test/test_state/user/mailinglist.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/user/mailinglist'
 require 'sbsm/validator'
 $: << File.expand_path("../..", File.dirname(__FILE__))
@@ -17,7 +17,6 @@ module State
     module User
 
 class TestMailingList <Minitest::Test
-  include FlexMock::TestCase
   def setup
 		Util.configure_mail :test
 		Util.clear_sent_mails
diff --git a/test/test_state/user/register_download.rb b/test/test_state/user/register_download.rb
index 83df12748..a47eb29b7 100755
--- a/test/test_state/user/register_download.rb
+++ b/test/test_state/user/register_download.rb
@@ -13,9 +13,9 @@ module Checkout
     end
   end
 end
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/user/register_download'
 
 
@@ -24,7 +24,6 @@ module State
     module User
 
 class TestRegisterDownload <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_state/zsr.rb b/test/test_state/zsr.rb
index 9a76db84f..78adca4d1 100755
--- a/test/test_state/zsr.rb
+++ b/test/test_state/zsr.rb
@@ -6,16 +6,15 @@
 
 require 'state/global'
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'state/zsr'
 require 'util/mail'
 
 module ODDB 
 	module State
 		class TestZSR <Minitest::Test
-			include FlexMock::TestCase
 			def test_zsr
 				@app     = flexmock('app')
 				@session = flexmock('session', 
diff --git a/test/test_util/config.rb b/test/test_util/config.rb
index a64193998..d3ed800c9 100755
--- a/test/test_util/config.rb
+++ b/test/test_util/config.rb
@@ -9,14 +9,13 @@
 
 require 'rclconf'
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/config'
 
 module ODDB
   class TestConfig <Minitest::Test
-    include FlexMock::TestCase
     def setup
       ##### OBSOLETE ######
       @config = Config.new
diff --git a/test/test_util/csstemplate.rb b/test/test_util/csstemplate.rb
index 46d687e2f..fb6adeba2 100755
--- a/test/test_util/csstemplate.rb
+++ b/test/test_util/csstemplate.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'util/csstemplate'
 
diff --git a/test/test_util/exporter.rb b/test/test_util/exporter.rb
index c6d0ad457..f96f8225f 100755
--- a/test/test_util/exporter.rb
+++ b/test/test_util/exporter.rb
@@ -4,15 +4,14 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/exporter'
 require 'util/log'
 require 'date'
 
 module ODDB
-  include FlexMock::TestCase
   class StubDRbObject
     def clear
     end
@@ -22,7 +21,6 @@ class Exporter
     EXPORT_SERVER = StubDRbObject.new
   end
   class TestExporter <Minitest::Test
-    include FlexMock::TestCase
     def test_test
       assert(true)
     end
diff --git a/test/test_util/failsafe.rb b/test/test_util/failsafe.rb
index 12a5597c8..4d59f7705 100755
--- a/test/test_util/failsafe.rb
+++ b/test/test_util/failsafe.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/failsafe'
 
 module ODDB
@@ -14,7 +14,6 @@ class StubFailsafe
     include Failsafe
   end
   class TestFailsafe <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @util = ODDB::StubFailsafe.new
     end
diff --git a/test/test_util/html_parser.rb b/test/test_util/html_parser.rb
index c8345cf58..bf26e90a5 100755
--- a/test/test_util/html_parser.rb
+++ b/test/test_util/html_parser.rb
@@ -7,9 +7,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/html_parser'
 
 module ODDB
@@ -149,7 +149,6 @@ def test_do_img
 end
 
 class TestHtmlFormatter <Minitest::Test
-  include FlexMock::TestCase
 	class StubWriter
 		attr_reader :called, :arguments
 		def method_missing(method_name, *args)
@@ -476,7 +475,6 @@ def test_attribute
 end
 
 class TestBasicHtmlParser <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @formatter = flexmock('formatter')
     @parser = ODDB::BasicHtmlParser.new(@formatter)
@@ -502,7 +500,6 @@ def test_start_td
 end
 
 class TestHtmlTableHandlerCell <Minitest::Test
-  include FlexMock::TestCase
   def setup
     attrs = {}
     @cell = ODDB::HtmlTableHandler::Cell.new(attrs)
@@ -545,7 +542,6 @@ def test_width
 end
 
 class TestHtmlTableHandlerRow <Minitest::Test
-  include FlexMock::TestCase
   def setup
     attrs = {}
     @row = ODDB::HtmlTableHandler::Row.new(attrs)
diff --git a/test/test_util/http.rb b/test/test_util/http.rb
index 51ddb8a0d..b1fa3757c 100755
--- a/test/test_util/http.rb
+++ b/test/test_util/http.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/http'
 require 'net/http'
 
@@ -19,7 +19,6 @@ class StubHttpFile
 
 module ODDB
   class TestHttpFile <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @file = ODDB::StubHttpFile.new
     end
@@ -51,7 +50,6 @@ def test_http_file
 
   class HttpSession < SimpleDelegator
     class TestResponseWrapper <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @response = flexmock('response')
         @wrapper  = ODDB::HttpSession::ResponseWrapper.new(@response)
@@ -94,7 +92,6 @@ def test_body__charset_nil_error
 
   class TestHttpSession <Minitest::Test
     HttpHeader = "Mozilla/5.0 (X11; Linux x86_64; rv:20.0) Gecko/20100101 Firefox/20.0"
-    include FlexMock::TestCase
     def setup
       @http        = flexmock('http')
       flexmock(Net::HTTP, :new => @http)
diff --git a/test/test_util/interval.rb b/test/test_util/interval.rb
index 2c9aab150..14f981c26 100755
--- a/test/test_util/interval.rb
+++ b/test/test_util/interval.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/interval'
 require 'odba'
 
@@ -70,7 +70,6 @@ def test_empty_range_patterns
 
 module ODDB
   class TestInterval <Minitest::Test
-    include FlexMock::TestCase
     class StubInterval
       include ODDB::Interval
       def initialize(model, session)
@@ -168,7 +167,6 @@ def test_filter_interval__else
   end
 
   class TestIndexedInterval <Minitest::Test
-    include FlexMock::TestCase
     class StubSuper
       def init
       end
diff --git a/test/test_util/ipn.rb b/test/test_util/ipn.rb
index 9281d9fd7..cdc1306c1 100755
--- a/test/test_util/ipn.rb
+++ b/test/test_util/ipn.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 $: << File.expand_path("..", File.dirname(__FILE__))
 require 'pp'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/ipn'
 require 'util/session'
 require 'tempfile'
@@ -19,7 +19,6 @@ module Util
     module Ipn
 
 class TestIpn <Minitest::Test
-  include FlexMock::TestCase
   YUS_NAME ='ipn'
   YUS_RECEIVER = 'ywesee_test@ywesee.com' # as defined in test/data/oddb_mailing_test.yml
   MAIL_FROM = [ 'invoice_from'  ]
diff --git a/test/test_util/iso-latin1.rb b/test/test_util/iso-latin1.rb
index 3b6b41099..ca1de0f82 100755
--- a/test/test_util/iso-latin1.rb
+++ b/test/test_util/iso-latin1.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/iso-latin1'
 
 module ODDB
   module Util
 
 class TestIsoLatin1 <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @str = 'TESTFÄLLE'
   end
diff --git a/test/test_util/language.rb b/test/test_util/language.rb
index 24c8d0ca2..45f4db86f 100755
--- a/test/test_util/language.rb
+++ b/test/test_util/language.rb
@@ -6,9 +6,9 @@
 #$: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/language'
 require 'odba'
 require 'util/searchterms'
@@ -132,7 +132,6 @@ class StubSimpleLanguage
   end
 
   class TestDescriptions <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @descriptions = ODDB::SimpleLanguage::Descriptions.new
     end
@@ -142,7 +141,6 @@ def test_first
   end
 
   class TestSimpleLanguage <Minitest::Test
-    include FlexMock::TestCase
     def setup
       flexmock(ODBA.cache, :next_id => 123)
       @simplelanguage = ODDB::StubSimpleLanguage.new
@@ -172,7 +170,6 @@ class StubLanguage
     include ODDB::Language
   end
   class TestLanguage <Minitest::Test
-    include FlexMock::TestCase
     def setup
       flexmock(ODBA.cache, :next_id => 123)
       @language = ODDB::StubLanguage.new
diff --git a/test/test_util/latest.rb b/test/test_util/latest.rb
index ec8fe790d..c2fe74116 100755
--- a/test/test_util/latest.rb
+++ b/test/test_util/latest.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/latest'
 
 module ODDB
@@ -19,7 +19,6 @@ class Latest
   ChangedContent = 'changed content size'
 
   class TestLatest <MiniTest::Unit::TestCase
-    include FlexMock::TestCase
     def setup
       @archive = File.expand_path('../var', File.dirname(__FILE__))
       FileUtils.rm_rf(@archive) if File.exists?(@archive)
diff --git a/test/test_util/levenshtein_distance.rb b/test/test_util/levenshtein_distance.rb
index 8536e8415..ccf4f1e42 100755
--- a/test/test_util/levenshtein_distance.rb
+++ b/test/test_util/levenshtein_distance.rb
@@ -4,7 +4,7 @@
 
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'util/levenshtein_distance'
 
diff --git a/test/test_util/log.rb b/test/test_util/log.rb
index ade856db3..88ddae928 100755
--- a/test/test_util/log.rb
+++ b/test/test_util/log.rb
@@ -3,7 +3,7 @@
 # Here we test whether sending mails work
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'config'
 require 'util/log'
diff --git a/test/test_util/logfile.rb b/test/test_util/logfile.rb
index ca80a702a..54be8dd39 100755
--- a/test/test_util/logfile.rb
+++ b/test/test_util/logfile.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'util/logfile'
 
diff --git a/test/test_util/loggroup.rb b/test/test_util/loggroup.rb
index d8dc632ff..783de6630 100755
--- a/test/test_util/loggroup.rb
+++ b/test/test_util/loggroup.rb
@@ -6,9 +6,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/loggroup'
 
 module ODDB
diff --git a/test/test_util/mail.rb b/test/test_util/mail.rb
index 36ac67ece..c294ebce0 100755
--- a/test/test_util/mail.rb
+++ b/test/test_util/mail.rb
@@ -3,7 +3,7 @@
 # Here we test whether sending mails work
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'config'
 require 'util/mail'
diff --git a/test/test_util/money.rb b/test/test_util/money.rb
index d5994e1e9..378ac31cd 100755
--- a/test/test_util/money.rb
+++ b/test/test_util/money.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/money'
 
 module ODDB
   module Util
 
 class TestMoney <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @money = ODDB::Util::Money.new(123.0, 'type', 'country')
   end
diff --git a/test/test_util/ngram_similarity.rb b/test/test_util/ngram_similarity.rb
index 5e15ad6eb..0f57f9a53 100755
--- a/test/test_util/ngram_similarity.rb
+++ b/test/test_util/ngram_similarity.rb
@@ -15,16 +15,15 @@ def NGramSimilarity.u(str)
   end
 end
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/ngram_similarity'
 
 module ODDB
   module Util
 
 class TestNGramSimilarity <Minitest::Test
-  include FlexMock::TestCase
   def test_compare
     assert_in_delta(0.428, NGramSimilarity.compare('str', 'string2', 1), 0.001)
   end
diff --git a/test/test_util/notification_logger.rb b/test/test_util/notification_logger.rb
index de3480774..2e07a900a 100755
--- a/test/test_util/notification_logger.rb
+++ b/test/test_util/notification_logger.rb
@@ -5,10 +5,10 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'util/notification_logger'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	class TestNotificationLogger <Minitest::Test
diff --git a/test/test_util/oddbapp.rb b/test/test_util/oddbapp.rb
index 4c73d6a0d..b62739a19 100755
--- a/test/test_util/oddbapp.rb
+++ b/test/test_util/oddbapp.rb
@@ -12,7 +12,7 @@
 YAML::ENGINE.yamler = 'syck'
 require 'stub/odba'
 require 'stub/config'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'stub/oddbapp'
 require 'digest/md5'
@@ -23,7 +23,7 @@
 require 'model/epha_interaction'
 require 'model/galenicform'
 require 'util/language'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/oddbapp'
 
 begin
@@ -33,7 +33,6 @@
 end
 
 class TestOddbApp <MiniTest::Unit::TestCase
-  include FlexMock::TestCase
 	def setup
 #    @drb = flexmock(DRb::DRbObject, :new => server)
 		ODDB::GalenicGroup.reset_oids
diff --git a/test/test_util/oddbapp_2.rb b/test/test_util/oddbapp_2.rb
index 867d1d327..4dde23927 100755
--- a/test/test_util/oddbapp_2.rb
+++ b/test/test_util/oddbapp_2.rb
@@ -11,7 +11,7 @@
 require 'yaml'
 YAML::ENGINE.yamler = 'syck'
 require 'stub/odba'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'stub/oddbapp'
 require 'digest/md5'
@@ -21,11 +21,10 @@
 require 'model/orphan'
 require 'model/galenicform'
 require 'util/language'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/oddbapp'
 
 class TestOddbApp2 <MiniTest::Unit::TestCase
-  include FlexMock::TestCase
   TEST_EAN13 = '7601123456789'
 	def setup
 		ODDB::GalenicGroup.reset_oids
diff --git a/test/test_util/oddbapp_3.rb b/test/test_util/oddbapp_3.rb
index beab4cf8c..0dd35a854 100755
--- a/test/test_util/oddbapp_3.rb
+++ b/test/test_util/oddbapp_3.rb
@@ -12,7 +12,7 @@
 YAML::ENGINE.yamler = 'syck'
 require 'stub/odba'
 require 'stub/config'
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'stub/oddbapp'
 require 'digest/md5'
@@ -23,7 +23,7 @@
 require 'model/epha_interaction'
 require 'model/galenicform'
 require 'util/language'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/oddbapp'
 
 begin
@@ -33,7 +33,6 @@
 end
 
 class TestOddbApp3 <MiniTest::Unit::TestCase
-  include FlexMock::TestCase
   def setup
 #    @drb = flexmock(DRb::DRbObject, :new => server)
     ODDB::GalenicGroup.reset_oids
diff --git a/test/test_util/persistence.rb b/test/test_util/persistence.rb
index 00017a87b..32dd93a70 100755
--- a/test/test_util/persistence.rb
+++ b/test/test_util/persistence.rb
@@ -7,12 +7,12 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'stub/odba'
 require 'util/persistence'
 require 'date'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	module Persistence
@@ -457,7 +457,6 @@ def test_respond_to_anything
 module ODDB
   module Persistence
     class TestPointer <Minitest::Test
-      include FlexMock::TestCase
       def test_to_csv
         pointer = ODDB::Persistence::Pointer.new(['key', 'value'])
         assert_equal('key,value', pointer.to_csv)
diff --git a/test/test_util/pointerarray.rb b/test/test_util/pointerarray.rb
index 4578101c9..ba783ec64 100755
--- a/test/test_util/pointerarray.rb
+++ b/test/test_util/pointerarray.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'util/pointerarray'
 
diff --git a/test/test_util/resilient_loop.rb b/test/test_util/resilient_loop.rb
index 62f33458a..9e6061026 100755
--- a/test/test_util/resilient_loop.rb
+++ b/test/test_util/resilient_loop.rb
@@ -2,7 +2,7 @@
 # encoding: utf-8
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'util/resilient_loop'
 
diff --git a/test/test_util/resultsort.rb b/test/test_util/resultsort.rb
index b2029038a..2236982f4 100755
--- a/test/test_util/resultsort.rb
+++ b/test/test_util/resultsort.rb
@@ -3,9 +3,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/resultsort'
 require 'model/dose'
 require 'model/slentry'
@@ -25,7 +25,6 @@ def get_sortby!
   end
 
   class TestResultStateSort <Minitest::Test
-    include FlexMock::TestCase
     def setup
       package = flexmock('package', :expired? => nil)
       @model = flexmock('model', :packages => [package])
@@ -44,7 +43,6 @@ def initialize(packages)
   end
 
   class TestResultSort <Minitest::Test
-    include FlexMock::TestCase
     @@seqnr ||= 1
     @@ikscd ||= 1
     @@iksnr ||= 12345
diff --git a/test/test_util/session.rb b/test/test_util/session.rb
index 5836306c1..3fc5966bd 100755
--- a/test/test_util/session.rb
+++ b/test/test_util/session.rb
@@ -7,9 +7,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/config'
 require 'util/session'
 # require 'stub/oddbapp'
@@ -17,7 +17,6 @@
 
 module ODDB
   class TestSession <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @unknown_user = flexmock('unknown_user',
                                :valid? => false)
diff --git a/test/test_util/soundex.rb b/test/test_util/soundex.rb
index 70598df0b..89a336dda 100755
--- a/test/test_util/soundex.rb
+++ b/test/test_util/soundex.rb
@@ -4,7 +4,7 @@
 
 $: << File.expand_path('../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'util/soundex'
 
diff --git a/test/test_util/tel_search.rb b/test/test_util/tel_search.rb
index 39ede7110..01c7ed770 100755
--- a/test/test_util/tel_search.rb
+++ b/test/test_util/tel_search.rb
@@ -3,7 +3,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'util/tel_search'
 require 'open-uri'
diff --git a/test/test_util/updater.rb b/test/test_util/updater.rb
index 06fa2476f..4f990480b 100755
--- a/test/test_util/updater.rb
+++ b/test/test_util/updater.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/updater'
 require 'stub/odba'
 require 'date'
@@ -42,7 +42,6 @@ def incomplete_pointers
 		alias :recipients :incomplete_pointers
 	end
   class TestUpdater < Minitest::Test
-    include FlexMock::TestCase
 		class StubLog
 			include ODDB::Persistence
 			attr_accessor :report, :pointers, :recipients, :hash
diff --git a/test/test_util/upload.rb b/test/test_util/upload.rb
index 1588069e7..fef6c77fd 100755
--- a/test/test_util/upload.rb
+++ b/test/test_util/upload.rb
@@ -4,14 +4,13 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/upload'
 
 module ODDB
   class TestUpload <Minitest::Test
-    include FlexMock::TestCase
     def setup
       @io  = flexmock('io', 
                      :original_filename => 'original_filename',
diff --git a/test/test_util/validator.rb b/test/test_util/validator.rb
index 1713353ca..1986e9aa4 100755
--- a/test/test_util/validator.rb
+++ b/test/test_util/validator.rb
@@ -6,15 +6,14 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/validator'
 require 'util/persistence'
 require 'sbsm/validator'
 
 class TestOddbValidator <Minitest::Test
-  include FlexMock::TestCase
 	def setup
 		@validator = ODDB::Validator.new
 	end
diff --git a/test/test_util/zlog.rb b/test/test_util/zlog.rb
index b75e1703a..2eecb06d3 100755
--- a/test/test_util/zlog.rb
+++ b/test/test_util/zlog.rb
@@ -5,18 +5,17 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'util/log'
 require 'stub/odba'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'util/logfile'
 require 'util/mail'
 
 module ODDB
 
    class TestLog <Minitest::Test
-    include FlexMock::TestCase
     TEST_SENDER   = 'default_mail_from@ywesee.com'
     LOG_RECEIVER  = 'ywesee_test@ywesee.com' # as defined in test/data/oddb_mailing_test.yml
     SUBJECT       = 'ch.ODDB.org Report - 08/1975'
diff --git a/test/test_util/zsr.rb b/test/test_util/zsr.rb
index ed0616933..07f7ec401 100755
--- a/test/test_util/zsr.rb
+++ b/test/test_util/zsr.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'util/zsr'
 
diff --git a/test/test_view/address.rb b/test/test_view/address.rb
index a5d602959..b152b00d3 100755
--- a/test/test_view/address.rb
+++ b/test/test_view/address.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/address'
 require 'htmlgrid/button'
@@ -23,7 +23,6 @@ def initialize(model, session)
   end
 end
 class TestVCardMethods <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -39,7 +38,6 @@ def test_vcard
   end
 end
 class TestSuggestedAddress <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -82,7 +80,6 @@ def test_correct
 end
 
 class TestAddress <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/admin/activeagent.rb b/test/test_view/admin/activeagent.rb
index ed24d2cf2..6d6c6316e 100755
--- a/test/test_view/admin/activeagent.rb
+++ b/test/test_view/admin/activeagent.rb
@@ -4,10 +4,10 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'stub/odba'
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/activeagent'
 require 'view/additional_information'
 require 'view/admin/activeagent'
@@ -17,7 +17,6 @@ module View
     module Admin
 
 class TestActiveAgentInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup   => 'lookup',
@@ -38,7 +37,6 @@ def test_substance
 end
 
 class TestActiveAgentForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -60,7 +58,6 @@ def test_init
 end
 
 class TestActiveAgentComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app')
     @lnf       = flexmock('lookandfeel', 
@@ -95,7 +92,6 @@ def initialize(model, session, other)
   end
 end
 class TestRootActiveAgentComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app')
     @lnf       = flexmock('lookandfeel', 
diff --git a/test/test_view/admin/address_suggestion.rb b/test/test_view/admin/address_suggestion.rb
index 4986e165b..1be682549 100755
--- a/test/test_view/admin/address_suggestion.rb
+++ b/test/test_view/admin/address_suggestion.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'htmlgrid/errormessage'
 require 'htmlgrid/select'
@@ -16,7 +16,6 @@
 require 'htmlgrid/textarea'
 
 class TestAddressSuggestionForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -38,7 +37,6 @@ def test_init
 end
 
 class TestAddressSuggestionInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def test_message
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -55,7 +53,6 @@ def test_message
 end
 
 class TestActiveAddress <Minitest::Test
-  include FlexMock::TestCase
   def test_parent_class
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -81,7 +78,6 @@ def test_parent_class
 end
 
 class TestAddressSuggestionComposite <Minitest::Test
-  include FlexMock::TestCase
   def test_address
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/addresses.rb b/test/test_view/admin/addresses.rb
index 286187b06..6ce310153 100755
--- a/test/test_view/admin/addresses.rb
+++ b/test/test_view/admin/addresses.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/addresses'
 require 'model/company'
 
@@ -16,7 +16,6 @@ module View
     module Admin
 
 class TestAddressList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/admin/assign_deprived_sequence.rb b/test/test_view/admin/assign_deprived_sequence.rb
index 5d04a0897..3a10fe06e 100755
--- a/test/test_view/admin/assign_deprived_sequence.rb
+++ b/test/test_view/admin/assign_deprived_sequence.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/admin/assign_deprived_sequence'
 
@@ -15,7 +15,6 @@ module View
     module Admin
 
 class TestAssignDeprivedSequenceForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/admin/assign_fachinfo.rb b/test/test_view/admin/assign_fachinfo.rb
index c8b838774..1dcca378c 100755
--- a/test/test_view/admin/assign_fachinfo.rb
+++ b/test/test_view/admin/assign_fachinfo.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/admin/assign_fachinfo'
 
@@ -15,7 +15,6 @@ module View
     module Admin
 
 class TestAssignFachinfoForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/admin/assign_patinfo.rb b/test/test_view/admin/assign_patinfo.rb
index 825bca70a..05f191dcd 100755
--- a/test/test_view/admin/assign_patinfo.rb
+++ b/test/test_view/admin/assign_patinfo.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/admin/assign_patinfo'
 
@@ -15,7 +15,6 @@ module View
     module Admin
 
 class TestAssignPatinfoForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -84,7 +83,6 @@ def test_patinfo_pointer__else
 end
 
 class TestAssignPatinfoComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/centeredsearchform.rb b/test/test_view/admin/centeredsearchform.rb
index 65b330cab..2474cf4f0 100755
--- a/test/test_view/admin/centeredsearchform.rb
+++ b/test/test_view/admin/centeredsearchform.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/centeredsearchform'
 
 
@@ -15,7 +15,6 @@ module View
     module Admin
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app', 
                           :package_count   => 0,
diff --git a/test/test_view/admin/commercial_form.rb b/test/test_view/admin/commercial_form.rb
index df6fe605e..8f2592e19 100755
--- a/test/test_view/admin/commercial_form.rb
+++ b/test/test_view/admin/commercial_form.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/descriptionform'
 require 'htmlgrid/labeltext'
 require 'view/admin/registration'
@@ -19,7 +19,6 @@ module View
     module Admin
 
 class TestCommercialFormForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -43,7 +42,6 @@ def test_languages
 end
 
 class TestCommercialFormComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/entities.rb b/test/test_view/admin/entities.rb
index 0f50630fe..74d00870c 100755
--- a/test/test_view/admin/entities.rb
+++ b/test/test_view/admin/entities.rb
@@ -5,9 +5,9 @@
 #$: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/entities'
 require 'model/company'
 require 'model/galenicgroup'
@@ -23,7 +23,6 @@ class Session
     module Admin
 
 class TestEntities <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/admin/entity.rb b/test/test_view/admin/entity.rb
index 73a665a7e..86659507b 100755
--- a/test/test_view/admin/entity.rb
+++ b/test/test_view/admin/entity.rb
@@ -5,15 +5,14 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/entity'
 require 'htmlgrid/inputcheckbox'
 require 'htmlgrid/pass'
 
 class TestYusPrivileges <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -67,7 +66,6 @@ def test_row_css
 end
 
 class TestYusGroups <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -104,7 +102,6 @@ def test_privileged_until
 end
 
 class TestEntityForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     setup_work
   end
diff --git a/test/test_view/admin/fachinfoconfirm.rb b/test/test_view/admin/fachinfoconfirm.rb
index 002a70351..d85d6c0d5 100755
--- a/test/test_view/admin/fachinfoconfirm.rb
+++ b/test/test_view/admin/fachinfoconfirm.rb
@@ -6,11 +6,11 @@
 $: << File.expand_path("../..", File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'view/admin/fachinfoconfirm'
 require 'stub/cgi'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	module View
@@ -22,7 +22,6 @@ class FachinfoConfirmForm < View::FormList
 	end
 end
 class TestFachinfoConfirmForm <Minitest::Test
-  include FlexMock::TestCase
 	class StubSession
 		attr_writer :error, :warning
 		attr_accessor :event, :base_url
diff --git a/test/test_view/admin/galenicform.rb b/test/test_view/admin/galenicform.rb
index 47f269b9b..5f5866d43 100755
--- a/test/test_view/admin/galenicform.rb
+++ b/test/test_view/admin/galenicform.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/admin/galenicform'
 require 'stub/cgi'
@@ -81,8 +81,6 @@ def lookandfeel
 	class StubModel
 		attr_accessor :galenic_group
 	end
-
-  include FlexMock::TestCase
 	def setup
     flexstub(ODBA.cache) do |cache|
       cache.should_receive(:next_id).and_return(123)
@@ -99,7 +97,6 @@ def test_to_html
 end	
 
 class TestGalenicFormForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -123,7 +120,6 @@ def test_languages
 end
 
 class TestGalenicFormComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/admin/galenicgroup.rb b/test/test_view/admin/galenicgroup.rb
index a0a590d3c..6737d09e8 100755
--- a/test/test_view/admin/galenicgroup.rb
+++ b/test/test_view/admin/galenicgroup.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/select'
 require 'view/admin/galenicgroup'
 require 'model/company'
@@ -18,7 +18,6 @@ module View
     module Admin
 
 class TestGalenicGroupComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/indication.rb b/test/test_view/admin/indication.rb
index 8b1304554..040d28d94 100755
--- a/test/test_view/admin/indication.rb
+++ b/test/test_view/admin/indication.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/indication'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Admin
 
 class TestIndicationForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/admin/merge_commercial_form.rb b/test/test_view/admin/merge_commercial_form.rb
index 110fe1799..d28019de4 100755
--- a/test/test_view/admin/merge_commercial_form.rb
+++ b/test/test_view/admin/merge_commercial_form.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/privatetemplate'
 require 'htmlgrid/errormessage'
 require 'view/form'
@@ -18,7 +18,6 @@ module View
     module Admin
 
 class TestMergeCommercialFormForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -40,7 +39,6 @@ def test_init
 end
 
 class TestMergeCommercialFormComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/mergegalenicform.rb b/test/test_view/admin/mergegalenicform.rb
index 259a85486..fefff1102 100755
--- a/test/test_view/admin/mergegalenicform.rb
+++ b/test/test_view/admin/mergegalenicform.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/mergegalenicform'
 
 
@@ -15,7 +15,6 @@ module View
     module Admin
 
 class TestMergeGalenicFormForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -37,7 +36,6 @@ def test_init
 end
 
 class TestMergeGalenicFormComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/mergeindication.rb b/test/test_view/admin/mergeindication.rb
index c50b13945..38826d591 100755
--- a/test/test_view/admin/mergeindication.rb
+++ b/test/test_view/admin/mergeindication.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/errormessage'
 require 'view/admin/mergeindication'
 
@@ -16,7 +16,6 @@ module View
     module Admin
 
 class TestMergeIndicationForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -38,7 +37,6 @@ def test_init
 end
 
 class TestMergeIndicationComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/orphaned_fachinfo_assign.rb b/test/test_view/admin/orphaned_fachinfo_assign.rb
index 6c10b9b18..ee533b26d 100755
--- a/test/test_view/admin/orphaned_fachinfo_assign.rb
+++ b/test/test_view/admin/orphaned_fachinfo_assign.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/admin/orphaned_fachinfo_assign'
 
@@ -16,7 +16,6 @@ module View
     module Admin
 
 class TestOrphanedFachinfoRegistrations <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -45,7 +44,6 @@ def test_init
 end
 
 class TestOrphanedFachinfoAssignComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/orphaned_languages.rb b/test/test_view/admin/orphaned_languages.rb
index ba0ed5d23..601ac189a 100755
--- a/test/test_view/admin/orphaned_languages.rb
+++ b/test/test_view/admin/orphaned_languages.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/admin/orphaned_fachinfo_assign'
 
@@ -17,7 +17,6 @@ module View
     module Admin
 
 class TestOrphanedLanguagesList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -60,7 +59,6 @@ def initialize(model, session)
   end
 end
 class TestOrphanedLanguages <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/admin/orphaned_patinfo.rb b/test/test_view/admin/orphaned_patinfo.rb
index 75981c619..8ea14167f 100755
--- a/test/test_view/admin/orphaned_patinfo.rb
+++ b/test/test_view/admin/orphaned_patinfo.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/admin/orphaned_patinfo_assign'
 
@@ -16,7 +16,6 @@ module View
     module Admin
 
 class TestOrphanedPatinfoListInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -37,7 +36,6 @@ def test_list_index
 end
 
 class TestOrphanedPatinfoComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/orphaned_patinfo_assign.rb b/test/test_view/admin/orphaned_patinfo_assign.rb
index ef633595f..eb39ea860 100755
--- a/test/test_view/admin/orphaned_patinfo_assign.rb
+++ b/test/test_view/admin/orphaned_patinfo_assign.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/admin/orphaned_patinfo_assign'
 
@@ -16,7 +16,6 @@ module View
     module Admin
 
 class TestOrphanedPatinfoSequences <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -59,7 +58,6 @@ def test_init
 end
 
 class TestOrphanedPatinfoAssignComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/package.rb b/test/test_view/admin/package.rb
index 1df8a9565..531f455b2 100755
--- a/test/test_view/admin/package.rb
+++ b/test/test_view/admin/package.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/select'
 require 'htmlgrid/textarea'
 require 'htmlgrid/span'
@@ -16,7 +16,6 @@
 require 'view/admin/package'
 
 class TestCompositionSelect <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @session = flexmock('session')
     @model   = flexmock('model')
@@ -41,7 +40,6 @@ def test_shorten
 end
 
 class TestParts <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel',
                             :lookup     => 'lookup',
@@ -78,7 +76,6 @@ def test_delete
 end
 
 class TestPackageForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel', 
                             :lookup       => 'lookup',
@@ -129,7 +126,6 @@ def test_generic_group
 end
 
 class TestPackageComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel', 
                             :disabled?  => nil,
@@ -163,7 +159,6 @@ def test_source
 end
 
 class TestRootPackageComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel',
                             :attributes   => {},
@@ -234,7 +229,6 @@ def test_init
 end
 
 class TestDeductiblePackageComposite <Minitest::Test
-  include FlexMock::TestCase
   def test_source
     @lookandfeel = flexmock('lookandfeel', 
                             :attributes => {},
diff --git a/test/test_view/admin/password_lost.rb b/test/test_view/admin/password_lost.rb
index 622e38645..fa16d7d4e 100755
--- a/test/test_view/admin/password_lost.rb
+++ b/test/test_view/admin/password_lost.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/password_lost'
 
 
@@ -15,7 +15,6 @@ module View
     module Admin
 
 class TestPasswordLostComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/patent.rb b/test/test_view/admin/patent.rb
index 19b62b4b1..fe783c5f2 100755
--- a/test/test_view/admin/patent.rb
+++ b/test/test_view/admin/patent.rb
@@ -5,9 +5,9 @@
 #$: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/patent'
 
 =begin
@@ -16,7 +16,6 @@ module View
     module Admin
 =end
 class TestPatentInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -38,7 +37,6 @@ def test_base_patent_link
 end
 
 class TestReadonlyPatentComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -64,7 +62,6 @@ def test_registration_name
 end
 
 class TestPatentComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/patinfo_deprived_sequences.rb b/test/test_view/admin/patinfo_deprived_sequences.rb
index cd2130b0d..7fc508975 100755
--- a/test/test_view/admin/patinfo_deprived_sequences.rb
+++ b/test/test_view/admin/patinfo_deprived_sequences.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/admin/patinfo_deprived_sequences'
 
@@ -16,7 +16,6 @@ module View
     module Admin
 
 class TestPatinfoDeprivedSequencesList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -45,7 +44,6 @@ def test_nr
 end
 
 class TestShadowPatternForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/admin/patinfo_stats.rb b/test/test_view/admin/patinfo_stats.rb
index eda705083..d640d892f 100755
--- a/test/test_view/admin/patinfo_stats.rb
+++ b/test/test_view/admin/patinfo_stats.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/patinfo_stats'
 
 
@@ -15,7 +15,6 @@ module View
     module Admin
 
 class TestPatinfoStatsCompanyList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/admin/patinfopreview.rb b/test/test_view/admin/patinfopreview.rb
index 53ca34560..a6efdaf01 100755
--- a/test/test_view/admin/patinfopreview.rb
+++ b/test/test_view/admin/patinfopreview.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/patinfopreview'
 
 
@@ -15,7 +15,6 @@ module View
     module Admin
 
 class TestPatinfoPreviewComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_view/admin/registration.rb b/test/test_view/admin/registration.rb
index 6260af12c..44822acda 100755
--- a/test/test_view/admin/registration.rb
+++ b/test/test_view/admin/registration.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/admin/registration'
 require 'htmlgrid/span'
@@ -68,7 +68,6 @@ def htmlgrid_setup
 end
 
 class TestRegistrationSequences <Minitest::Test
-  include FlexMock::TestCase
   include ODDB::View::Admin::TestSetup
   def setup
     htmlgrid_setup
@@ -95,7 +94,6 @@ def test_seqnr__edit
   end
 end
 class TestRootRegistrationSequences <Minitest::Test
-  include FlexMock::TestCase
   include ODDB::View::Admin::TestSetup
   def setup
     htmlgrid_setup
@@ -109,7 +107,6 @@ def test_compose_empty_list
 end
 
 class TestFachinfoLanguageSelect <Minitest::Test
-  include FlexMock::TestCase
   include ODDB::View::Admin::TestSetup
   def setup
     htmlgrid_setup
@@ -126,7 +123,6 @@ def test_selection
 end
 
 class TestRegistrationInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   include ODDB::View::Admin::TestSetup
   def setup
     htmlgrid_setup
@@ -144,7 +140,6 @@ def test_generic_type
 end
 
 class TestRegistrationForm <Minitest::Test
-  include FlexMock::TestCase
   include ODDB::View::Admin::TestSetup
   def setup
     htmlgrid_setup
@@ -226,7 +221,6 @@ def test_violates_patent
 end
 
 class TestResellerRegistrationForm <Minitest::Test
-  include FlexMock::TestCase
   include ODDB::View::Admin::TestSetup
   def setup
     htmlgrid_setup
@@ -256,7 +250,6 @@ def test_reorganize_components
 end
 
 class TestRegistrationComposite <Minitest::Test
-  include FlexMock::TestCase
   include ODDB::View::Admin::TestSetup
   def setup
     htmlgrid_setup
diff --git a/test/test_view/admin/selectindication.rb b/test/test_view/admin/selectindication.rb
index ebe7a9f40..7e8dc7ea7 100755
--- a/test/test_view/admin/selectindication.rb
+++ b/test/test_view/admin/selectindication.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/selectindication'
 
 
@@ -15,7 +15,6 @@ module View
     module Admin
 
 class TestSelectIndicationForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -44,7 +43,6 @@ def test_selection_list
 end
 
 class TestSelectIndicationComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/selectsubstance.rb b/test/test_view/admin/selectsubstance.rb
index 2ea54b4cb..8998bbfcd 100755
--- a/test/test_view/admin/selectsubstance.rb
+++ b/test/test_view/admin/selectsubstance.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/selectsubstance'
 
 
@@ -15,7 +15,6 @@ module View
     module Admin
 
 class TestSelectSubstanceForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -44,7 +43,6 @@ def test_selection_list
 end
 
 class TestSelectSubstanceComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/admin/sequence.rb b/test/test_view/admin/sequence.rb
index 3e150fc57..1f8b21578 100755
--- a/test/test_view/admin/sequence.rb
+++ b/test/test_view/admin/sequence.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/additional_information'
 require 'view/admin/sequence'
 require 'htmlgrid/span'
@@ -15,7 +15,6 @@
 require 'view/admin/registration'
 
 class TestRootActiveAgents <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:lookup)
@@ -82,7 +81,6 @@ def test_unsaved
 end
 
 class TestSequencePackage <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:lookup)
@@ -138,7 +136,6 @@ def test_ikscd
 end
 
 class TestSequenceInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:attributes).and_return({})
@@ -178,7 +175,6 @@ def test_atc_request__else
 end
 
 class TestSequenceForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:attributes).and_return({})
@@ -320,7 +316,6 @@ def test_patinfo_upload__invoiceable
 end
 
 class TestSequenceComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:attributes).and_return({})
@@ -415,7 +410,6 @@ def test_source
 end
 
 class TestRootSequenceForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:attributes).and_return({})
@@ -487,7 +481,6 @@ def test_hidden_fields
 end
 
 class TestResellerSequenceComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:attributes).and_return({})
diff --git a/test/test_view/admin/slentry.rb b/test/test_view/admin/slentry.rb
index 91e103082..83cbfe478 100755
--- a/test/test_view/admin/slentry.rb
+++ b/test/test_view/admin/slentry.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/slentry'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Admin
 
 class TestSlEntryForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -36,7 +35,6 @@ def test_init
 end
 
 class TestSlEntryComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app')
     @lnf       = flexmock('lookandfeel', 
diff --git a/test/test_view/admin/sponsor.rb b/test/test_view/admin/sponsor.rb
index 25acc1a00..226522995 100755
--- a/test/test_view/admin/sponsor.rb
+++ b/test/test_view/admin/sponsor.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/sponsor'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Admin
 
 class TestSponsorForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/admin/wait_for_fachinfo.rb b/test/test_view/admin/wait_for_fachinfo.rb
index ae439c490..c71b8321e 100755
--- a/test/test_view/admin/wait_for_fachinfo.rb
+++ b/test/test_view/admin/wait_for_fachinfo.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/admin/wait_for_fachinfo'
 
 
@@ -18,7 +18,6 @@ class Session
     module Admin
 
 class TestStatusBar <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     state      = flexmock('state', :wait_counter => 0)
@@ -35,7 +34,6 @@ def test_init
 end
 
 class TestWaitForFachinfo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/ajax/ddd_chart.rb b/test/test_view/ajax/ddd_chart.rb
index c591be27f..29d048414 100755
--- a/test/test_view/ajax/ddd_chart.rb
+++ b/test/test_view/ajax/ddd_chart.rb
@@ -6,15 +6,14 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/ajax/ddd_chart'
 require 'RMagick'
 #require 'encoding/character/utf-8'
 
 class TestSideBar <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @sidebar = SideBar.new
   end
@@ -108,7 +107,6 @@ def test_draw__norm_data
 end
 
 class TestDDDChart <Minitest::Test
-  include FlexMock::TestCase
   def setup
     package  = flexmock('package',
                         :sequence             => 'sequence',
diff --git a/test/test_view/ajax/ddd_price.rb b/test/test_view/ajax/ddd_price.rb
index 79bb72b43..b3ee19eb3 100755
--- a/test/test_view/ajax/ddd_price.rb
+++ b/test/test_view/ajax/ddd_price.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/ajax/ddd_price'
 
 
@@ -15,7 +15,6 @@ module View
     module Ajax
 
 class TestDDDPriceTable <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -78,7 +77,6 @@ def test_calculation__mdose_lt_ddose
 end
 
 class TestDDDPrice <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookup     = flexmock('lookup', 
                           :value  => 'value',
diff --git a/test/test_view/ajax/json.rb b/test/test_view/ajax/json.rb
index d6c1be36b..edf6cc458 100755
--- a/test/test_view/ajax/json.rb
+++ b/test/test_view/ajax/json.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/ajax/json'
 
 
@@ -15,7 +15,6 @@ module View
     module Ajax
 
 class TestJson <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_view/ajax/swissmedic_cat.rb b/test/test_view/ajax/swissmedic_cat.rb
index 5e523ce9d..b1180f257 100755
--- a/test/test_view/ajax/swissmedic_cat.rb
+++ b/test/test_view/ajax/swissmedic_cat.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/ajax/swissmedic_cat'
 require 'htmlgrid/link'
 
@@ -16,7 +16,6 @@ module View
     module Ajax
 
 class TestSwissmedicCat <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup      => 'lookup',
diff --git a/test/test_view/analysis/centeredsearchform.rb b/test/test_view/analysis/centeredsearchform.rb
index 23c7c510f..4d7cf4022 100755
--- a/test/test_view/analysis/centeredsearchform.rb
+++ b/test/test_view/analysis/centeredsearchform.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/analysis/centeredsearchform'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Analysis
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/analysis/explain_result.rb b/test/test_view/analysis/explain_result.rb
index 15c8238ce..ff3b261a5 100755
--- a/test/test_view/analysis/explain_result.rb
+++ b/test/test_view/analysis/explain_result.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/analysis/explain_result'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Analysis
 
 class TestExplainAnalysisTechnical1 <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @model     = flexmock('model')
@@ -38,7 +37,6 @@ def test_init__fr
 end
 
 class TestExplainAnalysisTechnical2 <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @model     = flexmock('model')
diff --git a/test/test_view/analysis/group.rb b/test/test_view/analysis/group.rb
index bd7c11ff6..f99548f34 100755
--- a/test/test_view/analysis/group.rb
+++ b/test/test_view/analysis/group.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'view/analysis/group'
 
@@ -15,7 +15,6 @@ module View
     module Analysis
 
 class TestPositionList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup => 'lookup',
@@ -42,7 +41,6 @@ def test_description
 end
 
 class TestGroupHeader <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', 
@@ -61,7 +59,6 @@ def test_analysis_positions
 end
 
 class TestGroupComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/analysis/position.rb b/test/test_view/analysis/position.rb
index 39fb3198e..ccb79b562 100755
--- a/test/test_view/analysis/position.rb
+++ b/test/test_view/analysis/position.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'htmlgrid/labeltext'
 require 'view/analysis/position'
@@ -17,7 +17,6 @@ module View
     module Analysis
 
 class TestAdditionalInfoComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', 
@@ -46,7 +45,6 @@ def test_info_ext_material
 end
 
 class TestPositionInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup => 'lookup',
@@ -85,7 +83,6 @@ def test_description
 end
 
 class TestPositionComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf        = flexmock('lookandfeel', 
                            :lookup     => 'lookup',
diff --git a/test/test_view/analysis/result.rb b/test/test_view/analysis/result.rb
index fdc3290e0..a11f34849 100755
--- a/test/test_view/analysis/result.rb
+++ b/test/test_view/analysis/result.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'view/analysis/result'
 require 'model/package'
@@ -17,7 +17,6 @@ module View
     module Analysis
 
 class TestList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -61,7 +60,6 @@ def test_description__blutgase
 end
 
 class TestEmptyResultForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/centeredsearchform.rb b/test/test_view/centeredsearchform.rb
index 1a9a8a9d4..cadf70b6e 100755
--- a/test/test_view/centeredsearchform.rb
+++ b/test/test_view/centeredsearchform.rb
@@ -5,16 +5,15 @@
 $: << File.expand_path("..", File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/centeredsearchform'
 
 module ODDB
 module View
 
 class TestPayPalForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel',
                         :attributes      => {},
@@ -38,7 +37,6 @@ def test_hidden_fields
 end # TestCenteredNavigation
 
 class TestCenteredSearchForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @zones   = flexmock('zones', :sort_by => [], :each_with_index => nil)
     @lnf     = flexmock('lookandfeel', 
@@ -108,7 +106,6 @@ def test_search_reset
 end # TestCenteredSearchForm
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :enabled?   => nil,
diff --git a/test/test_view/chapter.rb b/test/test_view/chapter.rb
index 58c346a02..072aa6483 100755
--- a/test/test_view/chapter.rb
+++ b/test/test_view/chapter.rb
@@ -6,12 +6,12 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'view/chapter'
 require 'stub/cgi'
 require 'model/text'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	module View
@@ -95,7 +95,6 @@ def test_formatted_paragraph
 			end
 		end
     class TestChapter2 <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @lnf     = flexmock('lookandfeel')
         @session = flexmock('session', :lookandfeel => @lnf)
@@ -295,7 +294,6 @@ def test_sections
 
     
     class TestEditChapterTableToHtml <Minitest::Test
-      include FlexMock::TestCase
       def test_table_to_html
         @lookandfeel = FlexMock.new 'lookandfeel'
         @lookandfeel.should_receive(:section_style).and_return { 'section_style' }
diff --git a/test/test_view/companies/centeredsearchform.rb b/test/test_view/companies/centeredsearchform.rb
index ae2b557f4..5f7dfad85 100755
--- a/test/test_view/companies/centeredsearchform.rb
+++ b/test/test_view/companies/centeredsearchform.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/companies/centeredsearchform'
 
 
@@ -15,7 +15,6 @@ module View
     module Companies
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app', :company_count => 0)
     @lnf       = flexmock('lookandfeel', 
diff --git a/test/test_view/companies/company.rb b/test/test_view/companies/company.rb
index 02e11330e..8954f7e98 100755
--- a/test/test_view/companies/company.rb
+++ b/test/test_view/companies/company.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/companies/company'
 
 module ODDB
@@ -19,7 +19,6 @@ class Session
 end
 
 class TestUnknownCompanyInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:lookup).and_return('lookup')
@@ -39,7 +38,6 @@ def test_address
 end
 
 class TestUserCompanyForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:attributes).and_return({})
@@ -85,7 +83,6 @@ def test_set_pass
 end
 
 class TestAjaxCompanyForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:attributes).and_return({})
@@ -114,7 +111,6 @@ def test_business_area
 end
 
 class TestUnknownCompanyComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:attributes).and_return({})
@@ -139,7 +135,6 @@ def test_ean13
 end
 
 class TestUserCompanyComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:attributes).and_return({})
@@ -171,7 +166,6 @@ def test_inactive_packages
 end
 
 class TestRootPharmaCompanyComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:attributes).and_return({})
@@ -233,7 +227,6 @@ class Copyright < HtmlGrid::Composite
   end
 end
 class TestRootCompany <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:enabled?)
diff --git a/test/test_view/companies/companylist.rb b/test/test_view/companies/companylist.rb
index d87adc016..296b11d13 100755
--- a/test/test_view/companies/companylist.rb
+++ b/test/test_view/companies/companylist.rb
@@ -6,10 +6,10 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'view/companies/companylist'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/company'
 
 module ODDB
@@ -21,7 +21,6 @@ module CompanyList
 end
 
 class TestCompanyList <Minitest::Test
-  include FlexMock::TestCase
 	class StubModel
 		attr_reader :name
 		def initialize(name)
@@ -83,7 +82,6 @@ def test_no_double_sort
 end
 
 class TestEmptyResultForm <Minitest::Test
-  include FlexMock::TestCase
   def test_title_none_found
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -105,7 +103,6 @@ def test_title_none_found
 end
 
 class TestRootEmptyResultForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :attributes => {},
@@ -134,7 +131,6 @@ def name
   end
 end
 class TestUnknownCompaniesComposite <Minitest::Test
-  include FlexMock::TestCase
   def test_company_list
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -161,7 +157,6 @@ def test_company_list
 end
 
 class TestRootCompaniesComposite <Minitest::Test
-  include FlexMock::TestCase
   def test_listed_companies
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/companies/fipi_csv.rb b/test/test_view/companies/fipi_csv.rb
index 18407d1d1..86c7b69b6 100755
--- a/test/test_view/companies/fipi_csv.rb
+++ b/test/test_view/companies/fipi_csv.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/companies/fipi_csv.rb'
 require 'csv'
 
@@ -15,7 +15,6 @@ module View
     module Companies
 
 class TestFiPiCsv <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', 
diff --git a/test/test_view/companies/fipi_overview.rb b/test/test_view/companies/fipi_overview.rb
index 77fbf0c7a..bc2496665 100755
--- a/test/test_view/companies/fipi_overview.rb
+++ b/test/test_view/companies/fipi_overview.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/companies/fipi_overview.rb'
 
 
@@ -15,7 +15,6 @@ module View
     module Companies
 
 class TestFiPiOverviewList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
@@ -64,7 +63,6 @@ def test_swissmedic_numbers__no_fachinfo
 end
 
 class TestExportCSV <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -82,7 +80,6 @@ def test_init
 end
 
 class TestFiPiOverviewComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/companies/mergecompanies.rb b/test/test_view/companies/mergecompanies.rb
index 3eb6e9161..69c7d94ba 100755
--- a/test/test_view/companies/mergecompanies.rb
+++ b/test/test_view/companies/mergecompanies.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/companies/mergecompanies'
 
 
@@ -15,7 +15,6 @@ module View
     module Companies
 
 class TestMergeCompaniesForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -36,7 +35,6 @@ def test_init
 end
 
 class TestMergeCompaniesComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/confirm.rb b/test/test_view/confirm.rb
index f1186833f..b1dcfd083 100755
--- a/test/test_view/confirm.rb
+++ b/test/test_view/confirm.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/confirm'
 
 module ODDB
@@ -16,7 +16,6 @@ class Session
   module View
   Copyright::ODDB_VERSION = 'version'
 class TestConfirmComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', :lookandfeel => @lnf)
@@ -29,7 +28,6 @@ def test_confirm
 end
 
 class TestConfirm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @zones    = flexmock('zones',
                          :sort_by => [],
diff --git a/test/test_view/custom/head.rb b/test/test_view/custom/head.rb
index 978dc71e6..a4228b34b 100755
--- a/test/test_view/custom/head.rb
+++ b/test/test_view/custom/head.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/custom/head'
 
 
@@ -15,7 +15,6 @@ module View
     module Custom
 
 class TestOekkHead <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -50,7 +49,6 @@ def initialize(model, session)
 end
 
 class TestHeadMethods <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
@@ -76,7 +74,6 @@ def initialize(model, session, *args)
 end
 
 class TestHead <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup   => 'lookup',
diff --git a/test/test_view/dataformat.rb b/test/test_view/dataformat.rb
index 3f287d018..d81f727af 100755
--- a/test/test_view/dataformat.rb
+++ b/test/test_view/dataformat.rb
@@ -34,7 +34,6 @@ module ODDB
 	module View
 
 class TestDataFormat <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/descriptionform.rb b/test/test_view/descriptionform.rb
index efda2c772..0a88c5668 100755
--- a/test/test_view/descriptionform.rb
+++ b/test/test_view/descriptionform.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'view/descriptionform'
 require 'stub/cgi'
diff --git a/test/test_view/descriptionlist.rb b/test/test_view/descriptionlist.rb
index f3b727e07..df3230161 100755
--- a/test/test_view/descriptionlist.rb
+++ b/test/test_view/descriptionlist.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'view/descriptionlist'
 
diff --git a/test/test_view/descriptionvalue.rb b/test/test_view/descriptionvalue.rb
index 85e1e6366..d81ba5573 100755
--- a/test/test_view/descriptionvalue.rb
+++ b/test/test_view/descriptionvalue.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/descriptionvalue'
 
 module ODDB
 	module View
 
 class TestDescriptionValue <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_view/doctors/centeredsearchform.rb b/test/test_view/doctors/centeredsearchform.rb
index 580baa661..1954ca5c6 100755
--- a/test/test_view/doctors/centeredsearchform.rb
+++ b/test/test_view/doctors/centeredsearchform.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/doctors/centeredsearchform'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Doctors
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app')
     @lnf       = flexmock('lookandfeel', 
diff --git a/test/test_view/doctors/doctor.rb b/test/test_view/doctors/doctor.rb
index a17842af3..e4286280f 100755
--- a/test/test_view/doctors/doctor.rb
+++ b/test/test_view/doctors/doctor.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/doctors/doctor'
 require 'htmlgrid/textarea'
 require 'model/address'
@@ -18,7 +18,6 @@ module View
     module Doctors
 
 class TestDoctorInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel',
                           :lookup     => 'lookup',
@@ -53,7 +52,6 @@ def test_specialities
 end
 
 class TestDoctorForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel',
                         :lookup     => 'lookup',
@@ -75,7 +73,6 @@ def test_init
 end
 
 class TestDoctorComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel',
                           :lookup     => 'lookup',
diff --git a/test/test_view/doctors/doctorlist.rb b/test/test_view/doctors/doctorlist.rb
index 5e74b46ac..a479e7d6d 100755
--- a/test/test_view/doctors/doctorlist.rb
+++ b/test/test_view/doctors/doctorlist.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'view/doctors/doctorlist'
 require 'model/company'
@@ -16,7 +16,6 @@ module View
     module Doctors
 
 class TestDoctorList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -61,7 +60,6 @@ def test_init
 end
 
 class TestEmptyResultForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/doctors/vcard.rb b/test/test_view/doctors/vcard.rb
index 1df8dd682..047c005b8 100755
--- a/test/test_view/doctors/vcard.rb
+++ b/test/test_view/doctors/vcard.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/doctors/vcard'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Doctors
 
 class TestVCard <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_view/drugs/atcchooser.rb b/test/test_view/drugs/atcchooser.rb
index 43f52d072..c697d8eb1 100755
--- a/test/test_view/drugs/atcchooser.rb
+++ b/test/test_view/drugs/atcchooser.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/atcchooser'
 require 'model/company'
 
@@ -24,7 +24,6 @@ def initialize(model, session)
       end
 
 class TestAtcDddLink <Minitest::Test
-  include FlexMock::TestCase
   def test_atc_ddd_link
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -46,7 +45,6 @@ def test_atc_ddd_link
 
 
 class TestAtcChooserList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/drugs/centeredsearchform.rb b/test/test_view/drugs/centeredsearchform.rb
index 87b9c2912..7a51c0d7d 100755
--- a/test/test_view/drugs/centeredsearchform.rb
+++ b/test/test_view/drugs/centeredsearchform.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/centeredsearchform'
 require 'model/package'
 require 'view/resulttemplate'
@@ -28,7 +28,6 @@ class Product
 end
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel',                             
                             :disabled?  => nil,
@@ -179,7 +178,6 @@ def test_substance_count
 
 #class TestRssFeedbackList <Minitest::Test
 class TestRssFeedbackList   <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel', 
                             :lookup     => 'lookup',
@@ -215,7 +213,6 @@ def test_heading__migel_product
 end
 
 class TestRssFeedbacks <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel',
                             :lookup     => 'lookup',
@@ -237,7 +234,6 @@ def test_rss_image
 end
 
 class TestFachinfoNewsList <Minitest::Test
-  include FlexMock::TestCase
   def test_name
     lookandfeel = flexmock('lookandfeel', 
                            :lookup     => 'lookup',
@@ -261,7 +257,6 @@ def test_name
 end
 
 class TestFachinfoNews <Minitest::Test
-  include FlexMock::TestCase
   def test_title
     lookandfeel = flexmock('lookandfeel', 
                            :lookup     => 'lookup',
@@ -290,7 +285,6 @@ def test_title
 end
 
 class TestSLPriceNews <Minitest::Test
-  include FlexMock::TestCase
   def test_title
     lookandfeel = flexmock('lookandfeel', 
                            :lookup     => 'lookup',
@@ -310,7 +304,6 @@ def test_title
 end
 
 class TestGoogleAdSenseComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel',
                             :enabled?     => nil,
diff --git a/test/test_view/drugs/compare.rb b/test/test_view/drugs/compare.rb
index 5f08e41f4..784412d6d 100755
--- a/test/test_view/drugs/compare.rb
+++ b/test/test_view/drugs/compare.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/compare'
 require 'htmlgrid/select'
 require 'sbsm/validator'
@@ -26,7 +26,6 @@ class Copyright < HtmlGrid::Composite
     module Drugs
 
 class TestCompareList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     comparison_sorter = Proc.new{}
     components = {[1, 2] => :active_agents}
@@ -73,7 +72,6 @@ def test_price_difference
 end
 
 class TestCompare <Minitest::Test
-  include FlexMock::TestCase
   def setup
     components = {[1, 2] => :active_agents}
     @lnf     = flexmock('lookandfeel', 
@@ -188,7 +186,6 @@ def test_backtracking__super
 end
 
 class TestEmptyCompareComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/drugs/compare_search.rb b/test/test_view/drugs/compare_search.rb
index 551033218..45e8ecb0d 100755
--- a/test/test_view/drugs/compare_search.rb
+++ b/test/test_view/drugs/compare_search.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/centeredsearchform'
 require 'view/drugs/compare_search'
 
@@ -15,7 +15,6 @@ module View
     module Drugs
 
 class TestCompareSearchForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @container = flexmock('container', :additional_javascripts => [])
     @lnf     = flexmock('lookandfeel', 
diff --git a/test/test_view/drugs/csv_result.rb b/test/test_view/drugs/csv_result.rb
index cbf521393..803cd1e8a 100755
--- a/test/test_view/drugs/csv_result.rb
+++ b/test/test_view/drugs/csv_result.rb
@@ -5,13 +5,12 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/csv_result'
 
 class TestCsvResult <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel', :lookup => 'lookup').by_default
     @session     = flexmock('session', :lookandfeel => @lookandfeel).by_default
diff --git a/test/test_view/drugs/ddd.rb b/test/test_view/drugs/ddd.rb
index f55460b7f..557a4e05b 100755
--- a/test/test_view/drugs/ddd.rb
+++ b/test/test_view/drugs/ddd.rb
@@ -5,9 +5,9 @@
 #$: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/ddd'
 
 
@@ -16,7 +16,6 @@ module View
     module Drugs
 
 class TestDDDComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
@@ -38,7 +37,6 @@ def test_init
 end
 
 class TestDDDTree <Minitest::Test
-  include FlexMock::TestCase
   def setup
     atc_class  = flexmock('atc_class', 
                           :has_ddd?    => nil,
diff --git a/test/test_view/drugs/ddd_price.rb b/test/test_view/drugs/ddd_price.rb
index b490a3adf..40c3025ba 100755
--- a/test/test_view/drugs/ddd_price.rb
+++ b/test/test_view/drugs/ddd_price.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/compare'
 require 'view/drugs/ddd_price'
 require 'htmlgrid/select'
@@ -30,7 +30,6 @@ module View
     module Drugs
 
 class TestDDDPriceTable <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -93,7 +92,6 @@ def test_calculation__mdose_ddose
 end
 
 class TestDDDPriceComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :enabled?   => nil,
@@ -150,7 +148,6 @@ def test_init
 end
 
 class TestDDDPrice <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf      = flexmock('lookandfeel', 
                          :enabled?   => nil,
diff --git a/test/test_view/drugs/fachinfo.rb b/test/test_view/drugs/fachinfo.rb
index 98050e5ec..cdee02f1f 100755
--- a/test/test_view/drugs/fachinfo.rb
+++ b/test/test_view/drugs/fachinfo.rb
@@ -6,7 +6,7 @@
 
 require 'stub/odba'
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/cgi'
 require 'view/drugs/fachinfo'
 require 'view/drugs/ddd'
@@ -26,7 +26,6 @@ class FiChapterChooser <  HtmlGrid::Composite
 end
 
 class TestFiChapterChooserLink <Minitest::Test
-  include FlexMock::TestCase
   def teardown
     ODBA.storage = nil
     super
@@ -77,7 +76,6 @@ def test_init__title_lookup
 end
 
 class TestFiChapterChooser <Minitest::Test
-  include FlexMock::TestCase
   def teardown
     ODBA.storage = nil
     super
@@ -142,7 +140,6 @@ def test_document_print
 end
 
 class TestFachinfoInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def test_init
     lookandfeel = flexmock('lookandfeel', :lookup     => 'lookup')
     @session    = flexmock('session', :lookandfeel => lookandfeel)
@@ -154,7 +151,6 @@ def test_init
 end
 
 class TestFachinfoPreviewComposite <Minitest::Test
-  include FlexMock::TestCase
   def test_fachinfo_name
     lookandfeel = flexmock('lookandfeel', :lookup     => 'lookup')
     @session    = flexmock('session', :lookandfeel => lookandfeel)
@@ -168,7 +164,6 @@ def test_fachinfo_name
 end
 
 class TestFachinfoComposite <Minitest::Test
-  include FlexMock::TestCase
   def teardown
     ODBA.storage = nil
     super
@@ -229,7 +224,6 @@ def test_document__chapter_nil
 end
 
 class TestEditFiChapterChooser <Minitest::Test
-  include FlexMock::TestCase
   def test_display_names
     photos  = flexmock('photos', :has_photo? => false)
     lookandfeel = flexmock('lookandfeel', 
@@ -271,7 +265,6 @@ def test_display_names
 end
 
 class TestRootFachinfoComposite <Minitest::Test
-  include FlexMock::TestCase
   def teardown
     ODBA.storage = nil
     super
@@ -361,7 +354,6 @@ def test_table_fachinfos
   end
 end
 class TestFI_ChangeLogs <Minitest::Test
-  include FlexMock::TestCase
   def teardown
     ODBA.storage = nil
     super
@@ -413,7 +405,6 @@ def test_document_change_log
 end
 
 class TestEvidentiaFiChapterChooser <Minitest::Test
-  include FlexMock::TestCase
   def teardown
     ODBA.storage = nil
     super
diff --git a/test/test_view/drugs/fachinfo_change_logs.rb b/test/test_view/drugs/fachinfo_change_logs.rb
index 6b3165968..19fc20f7c 100755
--- a/test/test_view/drugs/fachinfo_change_logs.rb
+++ b/test/test_view/drugs/fachinfo_change_logs.rb
@@ -4,9 +4,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/cgi'
 require 'stub/odba'
 require 'stub/session'
@@ -27,7 +27,6 @@ class Global < SBSM::State
   end
   module View
     class TestFachinfoChangelog <Minitest::Test
-      include FlexMock::TestCase
       DEBUG_HTML = false
       def teardown
         ODBA.storage = nil
diff --git a/test/test_view/drugs/fachinfos.rb b/test/test_view/drugs/fachinfos.rb
index bd111a35a..7ebcf2a78 100755
--- a/test/test_view/drugs/fachinfos.rb
+++ b/test/test_view/drugs/fachinfos.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path("../..", File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/odba'
 require 'stub/cgi'
 require 'view/resultfoot'
@@ -30,7 +30,6 @@ module View
     module Drugs
 
 class TestFachinfoList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -62,7 +61,6 @@ def test_fachinfo
 end
 
 class TestFachinfosComposite <Minitest::Test
-  include FlexMock::TestCase
     class StubRegistration
       attr_accessor :company_name
       attr_accessor :generic_type
diff --git a/test/test_view/drugs/feedbacks.rb b/test/test_view/drugs/feedbacks.rb
index e17a3ba0c..e206dc090 100755
--- a/test/test_view/drugs/feedbacks.rb
+++ b/test/test_view/drugs/feedbacks.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/resulttemplate'
 require 'view/drugs/feedbacks'
@@ -17,7 +17,6 @@ module View
     module Drugs
 
 class TestFeedbacksComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/drugs/javascript.rb b/test/test_view/drugs/javascript.rb
index f064c38fe..eccd0b2fe 100755
--- a/test/test_view/drugs/javascript.rb
+++ b/test/test_view/drugs/javascript.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fileutils'
 
diff --git a/test/test_view/drugs/limitationtext.rb b/test/test_view/drugs/limitationtext.rb
index 8e9d92053..178ae3ab4 100755
--- a/test/test_view/drugs/limitationtext.rb
+++ b/test/test_view/drugs/limitationtext.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/limitationtext'
 
 
@@ -15,7 +15,6 @@ module View
     module Drugs
 
 class TestLimitationTextInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', 
@@ -31,7 +30,6 @@ def test_init
 end
 
 class TestLimitationTextComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app')
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
diff --git a/test/test_view/drugs/limitationtexts.rb b/test/test_view/drugs/limitationtexts.rb
index d8be6349f..c911b8170 100755
--- a/test/test_view/drugs/limitationtexts.rb
+++ b/test/test_view/drugs/limitationtexts.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resultfoot'
 require 'view/drugs/limitationtexts'
 require 'model/sequence'
@@ -18,7 +18,6 @@ module View
     module Drugs
 
 class TestLimitationTextList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -48,7 +47,6 @@ def test_name
 end
 
 class TestLimitationTextsComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/drugs/minifi.rb b/test/test_view/drugs/minifi.rb
index 45854d116..cba024856 100755
--- a/test/test_view/drugs/minifi.rb
+++ b/test/test_view/drugs/minifi.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/minifi'
 
 
@@ -15,7 +15,6 @@ module View
     module Drugs
 
 class TestMiniFiChapter <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @container = flexmock('container')
     @lnf     = flexmock('lookandfeel', 
diff --git a/test/test_view/drugs/narcotic.rb b/test/test_view/drugs/narcotic.rb
index b76ca1193..512fe4c26 100755
--- a/test/test_view/drugs/narcotic.rb
+++ b/test/test_view/drugs/narcotic.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/narcotics'
 
 
@@ -17,7 +17,6 @@ module View
     module Drugs
 
 class TestPackagesList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -43,7 +42,6 @@ def test_init
 end
 
 class TestNarcoticsComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/drugs/narcotics.rb b/test/test_view/drugs/narcotics.rb
index 3cab2fc98..94a8e9fc2 100755
--- a/test/test_view/drugs/narcotics.rb
+++ b/test/test_view/drugs/narcotics.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/narcotics'
 
 
@@ -16,7 +16,6 @@ module View
     module Drugs
 
 class TestNarcoticList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup      => 'lookup',
@@ -57,7 +56,6 @@ def test_casrn
 end
 
 class TestNarcoticsComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/drugs/package.rb b/test/test_view/drugs/package.rb
index 2c4d418c3..a3172b659 100755
--- a/test/test_view/drugs/package.rb
+++ b/test/test_view/drugs/package.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/package'
 require 'htmlgrid/span'
 require 'model/index_therapeuticus'
@@ -24,7 +24,6 @@ class Session
 end
 
 class TestPackageInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel = flexmock('lookandfeel', 
                             :lookup     => 'lookup',
@@ -125,7 +124,6 @@ def test_introduction_date
   end
 end
 class TestODDBViewDrugsPackageComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup 
     dose = flexmock('dose', :qty => 'qty', :unit => 'unit')
     @lookandfeel = flexmock('lookandfeel',
@@ -267,7 +265,6 @@ def test_compositions
   end
 end
 class TestPackage <Minitest::Test
-  include FlexMock::TestCase
   def setup
     dose = flexmock('dose', :qty => 'qty', :unit => 'unit')
     lookandfeel = flexmock('lookandfeel',
diff --git a/test/test_view/drugs/patinfo.rb b/test/test_view/drugs/patinfo.rb
index 10bc31c9d..82b1be188 100755
--- a/test/test_view/drugs/patinfo.rb
+++ b/test/test_view/drugs/patinfo.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/patinfo'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Drugs
 
 class TestPatinfoInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', :lookandfeel => @lnf)
@@ -29,7 +28,6 @@ def test_init
 end
 
 class TestPatinfoComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/drugs/patinfos.rb b/test/test_view/drugs/patinfos.rb
index 23520e500..5ba13d035 100755
--- a/test/test_view/drugs/patinfos.rb
+++ b/test/test_view/drugs/patinfos.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resultfoot'
 require 'view/drugs/patinfos'
 
@@ -15,7 +15,6 @@ module View
     module Drugs
 
 class TestPatinfoList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -43,7 +42,6 @@ def test_name
 end
 
 class TestPatinfosComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/drugs/payment_method.rb b/test/test_view/drugs/payment_method.rb
index 7e5ca2d1f..577f0622f 100755
--- a/test/test_view/drugs/payment_method.rb
+++ b/test/test_view/drugs/payment_method.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/errormessage'
 require 'htmlgrid/select'
 require 'htmlgrid/list'
@@ -19,7 +19,6 @@ module View
     module Drugs
 
 class TestPaymentMethodForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/drugs/prescription.rb b/test/test_view/drugs/prescription.rb
index 3fee97cd5..8108ac067 100755
--- a/test/test_view/drugs/prescription.rb
+++ b/test/test_view/drugs/prescription.rb
@@ -5,23 +5,21 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/prescription'
 
 module ODDB
   module View
     module Drugs
 class TestPrescriptionInnerForm <Minitest::Test
-  include FlexMock::TestCase
   def test_init
     # pending
   end
 end
 
 class TestPrescriptionDrugsHeader <Minitest::Test
-  include FlexMock::TestCase
   def test_init
     # pending
   end
diff --git a/test/test_view/drugs/price_history.rb b/test/test_view/drugs/price_history.rb
index f26c56a2f..f7885611e 100755
--- a/test/test_view/drugs/price_history.rb
+++ b/test/test_view/drugs/price_history.rb
@@ -5,9 +5,9 @@
 #$: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/galenicgroup'
 require 'view/logo'
 require 'model/analysis/group'
@@ -25,7 +25,6 @@ class Copyright < HtmlGrid::Composite
     module Drugs
 
 class TestPriceHistoryList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -79,7 +78,6 @@ def test_origins
 end
 
 class TestPriceHistoryComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -105,7 +103,6 @@ def test_article_24
 end
 
 class TestPriceHistory <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf      = flexmock('lookandfeel', 
                          :lookup     => 'lookup',
diff --git a/test/test_view/drugs/recentregs.rb b/test/test_view/drugs/recentregs.rb
index 7222a12c2..3590ff999 100755
--- a/test/test_view/drugs/recentregs.rb
+++ b/test/test_view/drugs/recentregs.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/recentregs'
 require 'date'
 require 'htmlgrid/select'
@@ -17,7 +17,6 @@ module View
     module Drugs
 
 class TestDateChooser <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -42,7 +41,6 @@ def test_years
 end
 
 class TestDateHeader <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', :lookandfeel => @lnf)
@@ -59,7 +57,6 @@ def test_date_packages
 end
 
 class TestRootRecentRegsList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -104,7 +101,6 @@ def test_init
 end
 
 class TestRecentRegsList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -142,7 +138,6 @@ def test_init
 end
 
 class TestRecentRegsComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/drugs/register_download.rb b/test/test_view/drugs/register_download.rb
index 4b8fa4a62..a1754c2ea 100755
--- a/test/test_view/drugs/register_download.rb
+++ b/test/test_view/drugs/register_download.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/pass'
 require 'view/drugs/register_download'
 
@@ -26,7 +26,6 @@ module View
     module Drugs
 
 class TestRegisterDownloadForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -67,7 +66,6 @@ def test_hidden_fields
 end
 
 class TestRegisterInvoicedDownloadForm <Minitest::Test
-  include FlexMock::TestCase
   def test_submit
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -82,7 +80,6 @@ def test_submit
 end
 
 class TestRegisterInvoicedDownloadComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/drugs/result.rb b/test/test_view/drugs/result.rb
index 434d3d292..45033006f 100755
--- a/test/test_view/drugs/result.rb
+++ b/test/test_view/drugs/result.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/result'
 require 'htmlgrid/select'
 
@@ -16,7 +16,6 @@ module View
     module Drugs
 
 class TestDivExportCSV <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -40,7 +39,6 @@ def test_init
 end
 
 class TestEmptyResultComposite <Minitest::Test
-  include FlexMock::TestCase
   def test_title_none_found
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -64,7 +62,6 @@ def test_title_none_found
 end
 
 class TestResultComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :enabled?   => nil,
diff --git a/test/test_view/drugs/resultlimit.rb b/test/test_view/drugs/resultlimit.rb
index a5bfa0e96..c1fa58d96 100755
--- a/test/test_view/drugs/resultlimit.rb
+++ b/test/test_view/drugs/resultlimit.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/errormessage'
 require 'view/drugs/resultlimit'
 require 'htmlgrid/inputradio'
@@ -18,7 +18,6 @@ module View
     module Drugs
 
 class TestResultLimitList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -96,7 +95,6 @@ def test_most_precise_dose
 end
 
 class TestResultLimitComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/drugs/resultlist.rb b/test/test_view/drugs/resultlist.rb
index 70f59cbb0..1a4b70fd4 100755
--- a/test/test_view/drugs/resultlist.rb
+++ b/test/test_view/drugs/resultlist.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/resultlist'
 require 'view/drugs/rootresultlist'
 require 'util/language'
@@ -127,7 +127,6 @@ class RootUser
 end
 
 class TestResultList <Minitest::Test
-  include FlexMock::TestCase
 	class StubSession
 		attr_accessor :pages
 		attr_accessor :dictionary
@@ -286,7 +285,6 @@ def test_compose_list
 end
 
 class TestAtcHeader <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel', 
                            :lookup     => 'lookup',
diff --git a/test/test_view/drugs/search.rb b/test/test_view/drugs/search.rb
index 9cd9577c1..d080c65ae 100755
--- a/test/test_view/drugs/search.rb
+++ b/test/test_view/drugs/search.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/search'
 
 
@@ -19,7 +19,6 @@ class Session
     module Drugs
 
 class TestSearch <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', 
diff --git a/test/test_view/drugs/sequences.rb b/test/test_view/drugs/sequences.rb
index a8678c9e3..5a7f4d527 100755
--- a/test/test_view/drugs/sequences.rb
+++ b/test/test_view/drugs/sequences.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/sequences'
 
 
@@ -15,7 +15,6 @@ module View
     module Drugs
 
 class TestOffsetPager <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -40,7 +39,6 @@ def test_compose_footer
 end
 
 class TestSequenceList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -80,7 +78,6 @@ def test_name_base
 end
 
 class TestSequencesComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/drugs/vaccines.rb b/test/test_view/drugs/vaccines.rb
index f5547d7fe..56fd00c12 100755
--- a/test/test_view/drugs/vaccines.rb
+++ b/test/test_view/drugs/vaccines.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/drugs/sequences'
 require 'view/resultfoot'
 require 'view/drugs/vaccines'
@@ -16,7 +16,6 @@ module View
     module Drugs
 
 class TestVaccinesComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     component  = flexmock('component')
     @lnf       = flexmock('lookandfeel', 
diff --git a/test/test_view/exception.rb b/test/test_view/exception.rb
index 7bf4eec3f..0647190e4 100755
--- a/test/test_view/exception.rb
+++ b/test/test_view/exception.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/exception'
 
 module ODDB
   module View
 
 class TestExceptionComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/external_links.rb b/test/test_view/external_links.rb
index 1c2ffc19c..31c2db4b6 100755
--- a/test/test_view/external_links.rb
+++ b/test/test_view/external_links.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/navigationlink'
 require 'view/external_links'
 require 'htmlgrid/popuplink'
@@ -25,7 +25,6 @@ def initialize(model, session)
 end
 
 class TestStubExternalLinks <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/feedbacks.rb b/test/test_view/feedbacks.rb
index 5284ba765..f27441aa4 100755
--- a/test/test_view/feedbacks.rb
+++ b/test/test_view/feedbacks.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/feedbacks'
 
@@ -15,7 +15,6 @@ module ODDB
 	module View
 
 class TestFeedbackForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :attributes => {},
@@ -105,7 +104,6 @@ def test_feedback_text_e
 end
 
 class TestFeedbackList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     component  = flexmock('component', :update => 'update')
     components = {[0,0] => component}
@@ -159,7 +157,6 @@ def test_time
 end
 
 class TestFeedbackPager <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/form.rb b/test/test_view/form.rb
index b746ca445..a06406fec 100755
--- a/test/test_view/form.rb
+++ b/test/test_view/form.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/form'
 require 'util/persistence'
 
@@ -18,7 +18,6 @@ class StubViewForm < Form
 end
 
 class TestForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/google_ad_sense.rb b/test/test_view/google_ad_sense.rb
index 3b280fe7a..810814308 100755
--- a/test/test_view/google_ad_sense.rb
+++ b/test/test_view/google_ad_sense.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/component'
 require 'htmlgrid/composite'
 require 'view/google_ad_sense'
@@ -15,7 +15,6 @@ module ODDB
   module View
 
 class TestGoogleAdSense <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', :lookandfeel => @lnf)
@@ -30,12 +29,10 @@ def test_to_html
 
 
 class GoogleAdSenseComposite < HtmlGrid::Composite
-  include FlexMock::TestCase
   CONTENT = HtmlGrid::Component
 end
 
 class TestGoogleAdSenseComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup   => 'lookup',
diff --git a/test/test_view/hospitals/centeredsearchform.rb b/test/test_view/hospitals/centeredsearchform.rb
index b72e8fc70..a6da631c8 100755
--- a/test/test_view/hospitals/centeredsearchform.rb
+++ b/test/test_view/hospitals/centeredsearchform.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/hospitals/centeredsearchform'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Hospitals
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app')
     @lnf       = flexmock('lookandfeel', 
diff --git a/test/test_view/hospitals/hospital.rb b/test/test_view/hospitals/hospital.rb
index ba36ad426..16c3f75be 100755
--- a/test/test_view/hospitals/hospital.rb
+++ b/test/test_view/hospitals/hospital.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/hospitals/hospital'
 require 'htmlgrid/textarea'
 require 'model/company'
@@ -16,7 +16,6 @@ module View
     module Hospitals
 
 class TestHospitalInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -52,7 +51,6 @@ def test_location
 end
 
 class TestHospitalForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/hospitals/hospitallist.rb b/test/test_view/hospitals/hospitallist.rb
index 25d686f20..5d1f054e4 100755
--- a/test/test_view/hospitals/hospitallist.rb
+++ b/test/test_view/hospitals/hospitallist.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/hospitals/hospitallist'
 require 'model/company'
@@ -16,7 +16,6 @@ module View
     module Hospitals
 
 class TestHospitalList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -61,7 +60,6 @@ def test_narcotics
   end
 end
 class TestHospitalsComposite <Minitest::Test
-  include FlexMock::TestCase
   def test_hospital_list
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -104,7 +102,6 @@ def test_hospital_list
   end
 end
 class TestEmptyResultForm <Minitest::Test
-  include FlexMock::TestCase
   def test_title_none_found
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/hospitals/vcard.rb b/test/test_view/hospitals/vcard.rb
index 4163b49ca..b7c0e3ab1 100755
--- a/test/test_view/hospitals/vcard.rb
+++ b/test/test_view/hospitals/vcard.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/hospitals/vcard'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Hospitals
 
 class TestVCard <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_view/interactions/centeredsearchform.rb b/test/test_view/interactions/centeredsearchform.rb
index 12948c33a..b2d43ff96 100755
--- a/test/test_view/interactions/centeredsearchform.rb
+++ b/test/test_view/interactions/centeredsearchform.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/interactions/centeredsearchform'
 
 module ODDB
@@ -17,7 +17,6 @@ class Session
     module Interactions
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app', 
                           :package_count   => 0,
diff --git a/test/test_view/interactions/interaction_chooser.rb b/test/test_view/interactions/interaction_chooser.rb
index 7334742e6..5e6da2f87 100755
--- a/test/test_view/interactions/interaction_chooser.rb
+++ b/test/test_view/interactions/interaction_chooser.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/interactions/centeredsearchform'
 
 module ODDB
@@ -17,7 +17,6 @@ class Session
     module Interactions
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app', 
                           :package_count   => 0,
diff --git a/test/test_view/interactions/result.rb b/test/test_view/interactions/result.rb
index fab4801cc..020350246 100755
--- a/test/test_view/interactions/result.rb
+++ b/test/test_view/interactions/result.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'view/interactions/result'
 
@@ -15,7 +15,6 @@ module View
     module Interactions
 
 class TestResultForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -58,7 +57,6 @@ def test_interaction_basket_link
 end
 
 class TestEmptyResultForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/interactions/resultlist.rb b/test/test_view/interactions/resultlist.rb
index 2388de426..f91de01e7 100755
--- a/test/test_view/interactions/resultlist.rb
+++ b/test/test_view/interactions/resultlist.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/interactions/resultlist'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Interactions
 
 class TestResultList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/language_chooser.rb b/test/test_view/language_chooser.rb
index 103209392..28c7d4db4 100755
--- a/test/test_view/language_chooser.rb
+++ b/test/test_view/language_chooser.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/language_chooser'
 
 
@@ -23,7 +23,6 @@ def initialize(model, session)
 end
 
 class TestUserSettings <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/limit.rb b/test/test_view/limit.rb
index eb7d53820..c9b973322 100755
--- a/test/test_view/limit.rb
+++ b/test/test_view/limit.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/errormessage'
 require 'view/limit'
 require 'htmlgrid/inputradio'
@@ -19,7 +19,6 @@ class StubSession
     end
 
 class TestLimitForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -45,7 +44,6 @@ def test_init
 end
 
 class TestLimitComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/logo.rb b/test/test_view/logo.rb
index 52a6980c8..4e9a710f3 100755
--- a/test/test_view/logo.rb
+++ b/test/test_view/logo.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/logohead'
 require 'view/logo'
 
@@ -21,7 +21,6 @@ module View
     class PopupLogo
     end
 class TestPopupLogo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel',
                         :lookup     => 'lookup',
@@ -75,7 +74,6 @@ def test_zone_logo_src
 end
 
 class TestLogo <Minitest::Test
-  include FlexMock::TestCase
     def test_to_html
     @lnf     = flexmock('lookandfeel',
                         :lookup     => 'lookup',
diff --git a/test/test_view/logohead.rb b/test/test_view/logohead.rb
index 5b0e08811..7c3b4e851 100755
--- a/test/test_view/logohead.rb
+++ b/test/test_view/logohead.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/logohead'
 require 'htmlgrid/span'
 
@@ -24,7 +24,6 @@ def initialize(model, session)
 end
 
 class TestSponsorDisplay <Minitest::Test
-  include FlexMock::TestCase
   def test_sponsor__sponsor_valid
     user    = flexmock('user', :valid? => nil)
     lnf     = flexmock('lookandfeel', 
diff --git a/test/test_view/lookandfeel_components.rb b/test/test_view/lookandfeel_components.rb
index bec1835eb..0e7673a39 100755
--- a/test/test_view/lookandfeel_components.rb
+++ b/test/test_view/lookandfeel_components.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/lookandfeel_components'
 
 module ODDB
@@ -23,7 +23,6 @@ def initialize(model, session)
   end
 end
 class TestLookandfeelComponents <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup => 'lookup',
diff --git a/test/test_view/migel/centeredsearchform.rb b/test/test_view/migel/centeredsearchform.rb
index a92950e76..954c97255 100755
--- a/test/test_view/migel/centeredsearchform.rb
+++ b/test/test_view/migel/centeredsearchform.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/migel/centeredsearchform'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Migel
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app')
     @lnf       = flexmock('lookandfeel', 
diff --git a/test/test_view/migel/feedbacks.rb b/test/test_view/migel/feedbacks.rb
index f40bfd744..06aeddd10 100755
--- a/test/test_view/migel/feedbacks.rb
+++ b/test/test_view/migel/feedbacks.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/resulttemplate'
 require 'view/migel/feedbacks'
@@ -17,7 +17,6 @@ module View
     module Migel
 
 class TestFeedbacksComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/migel/group.rb b/test/test_view/migel/group.rb
index df8f34fde..a4f2d7af3 100755
--- a/test/test_view/migel/group.rb
+++ b/test/test_view/migel/group.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'view/migel/group'
 
@@ -15,7 +15,6 @@ module View
     module Migel
 
 class TestGroupInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', 
@@ -36,7 +35,6 @@ def test_description
 end
 
 class TestGroupComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup => 'lookup',
diff --git a/test/test_view/migel/items.rb b/test/test_view/migel/items.rb
index 4648fde54..5861462da 100755
--- a/test/test_view/migel/items.rb
+++ b/test/test_view/migel/items.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/lookandfeel_components'
 require 'view/migel/items'
 
@@ -21,7 +21,6 @@ def u(str)
       end
 
 class TestSubHeader <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -77,7 +76,6 @@ def test_pages_not_migel_code
 end
 
 class TestSearchedList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup => 'lookup',
diff --git a/test/test_view/migel/limitationtext.rb b/test/test_view/migel/limitationtext.rb
index e07ad746c..77d960f7c 100755
--- a/test/test_view/migel/limitationtext.rb
+++ b/test/test_view/migel/limitationtext.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/migel/limitationtext'
 require 'view/pointersteps'
 
@@ -19,7 +19,6 @@ class Session
     module Migel
 
 class TestLimitationTextInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
@@ -45,7 +44,6 @@ def test_group
 end
 
 class TestLimitationTextComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app     = flexmock('app')
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
@@ -69,7 +67,6 @@ def test_limitation_text_title
 end
 
 class TestLimitationText <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :enabled?   => nil,
diff --git a/test/test_view/migel/product.rb b/test/test_view/migel/product.rb
index 1a1716110..77ce5a665 100755
--- a/test/test_view/migel/product.rb
+++ b/test/test_view/migel/product.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'htmlgrid/labeltext'
 require 'view/migel/product'
@@ -28,7 +28,6 @@ class Session
     module Migel
 
 class TestProductInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lookandfeel    = flexmock('lookandfeel', 
                                :_event_url  => nil,
@@ -228,7 +227,6 @@ def test_migel_code__else
 
 
 class TestAccessoryOfList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @app     = flexmock('app')
@@ -250,7 +248,6 @@ def test_migel_code
 end
 
 class TestPointerSteps <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :disabled?  => nil,
@@ -331,7 +328,6 @@ def test_pointer_descr__product
 end
 
 class TestProduct <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :enabled? => nil,
diff --git a/test/test_view/migel/result.rb b/test/test_view/migel/result.rb
index 51eb2b9f1..1440957cd 100755
--- a/test/test_view/migel/result.rb
+++ b/test/test_view/migel/result.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'view/migel/result'
 
@@ -17,7 +17,6 @@ module View
     module Migel
 
 class TestList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -97,7 +96,6 @@ def test_migel_code__items
 end
 
 class TestResultList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -138,7 +136,6 @@ def test_compose_list
 end
 
 class TestEmptyResultForm <Minitest::Test
-  include FlexMock::TestCase
   def test_title_none_found
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/migel/subgroup.rb b/test/test_view/migel/subgroup.rb
index 0a1ce9151..546575e06 100755
--- a/test/test_view/migel/subgroup.rb
+++ b/test/test_view/migel/subgroup.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'view/migel/subgroup'
 
@@ -19,7 +19,6 @@ class Session
     module Migel
 
 class TestProductList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup      => 'lookup',
@@ -56,7 +55,6 @@ def test_migel_code
 end
 
 class TestSubgroupInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :_event_url => '_event_url')
     @session   = flexmock('session', 
@@ -83,7 +81,6 @@ def test_description
 end
 
 class TestSubgroupComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup      => 'lookup',
@@ -123,7 +120,6 @@ def test_products
 end
 
 class TestSubgroup <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup      => 'lookup',
diff --git a/test/test_view/navigation.rb b/test/test_view/navigation.rb
index bca0cdf16..15ad5360e 100755
--- a/test/test_view/navigation.rb
+++ b/test/test_view/navigation.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/navigation'
 
 module ODDB
   module View
 
 class TestNavigation <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @navigation = flexmock('navigation',
                             :each_with_index => 'each_with_index',
@@ -41,7 +40,6 @@ def test_build_navigation
 end
 
 class TestZoneNavigation <Minitest::Test
-  include FlexMock::TestCase
   def test_build_navigation
     @zone_navigation = flexmock('zone_navigation',
                                 :sort_by => ['zone_navigation'],
@@ -79,7 +77,6 @@ def test_build_navigation__else
 end
 
 class TestCountryNavigation <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/navigationfoot.rb b/test/test_view/navigationfoot.rb
index 94b83b6e9..c080a2981 100755
--- a/test/test_view/navigationfoot.rb
+++ b/test/test_view/navigationfoot.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/session'
 require 'view/navigationfoot.rb'
 require 'custom/lookandfeelbase'
@@ -95,7 +95,6 @@ module ODDB
   module View
 
 class TestNavigationFoot2 <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @navigation = flexmock('navigation',
                             :sort_by => [],
@@ -175,7 +174,6 @@ def test_init__custom_navigation
 end
 
 class TestTopFoot <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @zone_navigation = flexmock('zone_navigation',
                                 :sort_by => [],
diff --git a/test/test_view/navigationlink.rb b/test/test_view/navigationlink.rb
index 731c22544..94a7162de 100755
--- a/test/test_view/navigationlink.rb
+++ b/test/test_view/navigationlink.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/navigation'
 
 module ODDB
   module View
 
 class TestNavigationLink <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -36,7 +35,6 @@ def test_to_html
 end
 
 class TestLanguageNavigationLink <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -56,7 +54,6 @@ def test_init
 end
 
 class TestLanguageNavigationLinkShort <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -76,7 +73,6 @@ def test_init
 end
 
 class TestCurrencyNavigationLink <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/notify.rb b/test/test_view/notify.rb
index 49d089914..9b1c8696e 100755
--- a/test/test_view/notify.rb
+++ b/test/test_view/notify.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'view/notify'
 require 'model/package'
@@ -17,7 +17,6 @@ module ODDB
   module View
 
 class TestNotifyComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -58,7 +57,6 @@ def test_notify_title__zone_migel
 end
 
 class TestNotifyInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     generate_challenge = flexmock('generate_challenge', 
                                   :file => 'file',
@@ -87,7 +85,6 @@ def test_init
 end
 
 class TestNotifyMail <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf      = flexmock('lookandfeel', 
                          :lookup     => 'lookup',
diff --git a/test/test_view/notify_confirm.rb b/test/test_view/notify_confirm.rb
index ea485249b..87e30d147 100755
--- a/test/test_view/notify_confirm.rb
+++ b/test/test_view/notify_confirm.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'view/notify_confirm'
 
@@ -18,7 +18,6 @@ module View
     Copyright::ODDB_VERSION = 'version' 
 
 class TestNotifyConfirmComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -50,7 +49,6 @@ def test_notify_sent__mail_not_empty
 end
 
 class TestNotifyConfirm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @zones = flexmock('zones',
                       :sort_by => [],
diff --git a/test/test_view/pager.rb b/test/test_view/pager.rb
index 6b29f3b37..eb30b051a 100755
--- a/test/test_view/pager.rb
+++ b/test/test_view/pager.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/pager'
 require 'stub/cgi'
 
@@ -19,7 +19,6 @@ class Pager < HtmlGrid::List
 		end
 
 		class TestPager	<Minitest::Test
-      include FlexMock::TestCase
 			class StubSession
 				attr_accessor :page, :event, :dictionary
 				def attributes(key)
diff --git a/test/test_view/paypal/redirect.rb b/test/test_view/paypal/redirect.rb
index 999a7e428..a8bf9dc0e 100755
--- a/test/test_view/paypal/redirect.rb
+++ b/test/test_view/paypal/redirect.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/paypal/redirect'
 require 'model/user'
 
@@ -17,7 +17,6 @@ module PayPal
       PAYPAL_RECEIVER = 'receiver'
 
 class TestRedirect <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/paypal/return.rb b/test/test_view/paypal/return.rb
index 8858b4c22..36c03f384 100755
--- a/test/test_view/paypal/return.rb
+++ b/test/test_view/paypal/return.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/paypal/return'
 
 module ODDB
@@ -26,7 +26,6 @@ class ReturnDownloads < HtmlGrid::List
       end
 
 class TestReturnDownloads <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -62,7 +61,6 @@ def test_download_link__expired
 end
 
 class TestReturnComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -111,7 +109,6 @@ def test_init__payment_received
 end
 
 class TestReturn <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf      = flexmock('lookandfeel', 
                          :lookup     => 'lookup',
diff --git a/test/test_view/personal.rb b/test/test_view/personal.rb
index d09727e1b..f11e77f9f 100755
--- a/test/test_view/personal.rb
+++ b/test/test_view/personal.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/urllink'
 require 'view/personal'
 
@@ -22,7 +22,6 @@ def initialize(model, session)
   end
 end
 class TestPersonal <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel',
                         :attributes => {},
diff --git a/test/test_view/pharmacies/pharmacy.rb b/test/test_view/pharmacies/pharmacy.rb
index f0758c7ff..0f1d15ab5 100755
--- a/test/test_view/pharmacies/pharmacy.rb
+++ b/test/test_view/pharmacies/pharmacy.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/pharmacies/pharmacy'
 require 'htmlgrid/textarea'
 require 'model/company'
@@ -16,7 +16,6 @@ module View
     module Pharmacies
 
 class TestPharmacyInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel',
                           :lookup     => 'lookup',
@@ -56,7 +55,6 @@ def test_location
 end
 
 class TestPharmacyForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel',
                         :lookup     => 'lookup',
diff --git a/test/test_view/pointersteps.rb b/test/test_view/pointersteps.rb
index 7cbc473ec..2a8b32021 100755
--- a/test/test_view/pointersteps.rb
+++ b/test/test_view/pointersteps.rb
@@ -6,9 +6,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/company'
 require 'model/analysis/group'
 require 'model/galenicgroup'
@@ -107,7 +107,6 @@ def snapback
 		end
 
 		class TestPointerSteps <Minitest::Test
-      include FlexMock::TestCase
 			def setup 
 				@model = StubPointerStepsModel.new
 				@session = StubPointerStepsSession.new
diff --git a/test/test_view/printtemplate.rb b/test/test_view/printtemplate.rb
index 24e3eac1e..8194e7df5 100755
--- a/test/test_view/printtemplate.rb
+++ b/test/test_view/printtemplate.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/link'
 require 'view/printtemplate'
 
@@ -36,7 +36,6 @@ class StubPrintTemplate < PrintTemplate
     end
 
     class TestPrint <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @lnf     = flexmock('lookandfeel', 
                             :lookup     => 'lookup',
@@ -56,7 +55,6 @@ def test_rint_edit
     end
 
     class TestPrintTemplate <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @lnf     = flexmock('lookandfeel', 
                             :lookup     => 'lookup',
@@ -97,7 +95,6 @@ def initialize(model, session, *args)
     end
 
     class TestPrintComposite <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
         @session   = flexmock('session', 
diff --git a/test/test_view/privatetemplate.rb b/test/test_view/privatetemplate.rb
index 57594acff..fa2aa4891 100755
--- a/test/test_view/privatetemplate.rb
+++ b/test/test_view/privatetemplate.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/analysis/group'
 require 'model/company'
 require 'model/doctor'
@@ -21,12 +21,10 @@ class Session
       DEFAULT_FLAVOR = 'gcc'
     end
 class StubPrivateTemplate < ODDB::View::PrivateTemplate
-  include FlexMock::TestCase
   CONTENT = 'content'
 end
 
 class TestPrivateTemplate <Minitest::Test
-  include FlexMock::TestCase
   def stderr_null
     require 'tempfile'
     $stderr = Tempfile.open('stderr')
diff --git a/test/test_view/publictemplate.rb b/test/test_view/publictemplate.rb
index 02e91d993..18ca33a57 100755
--- a/test/test_view/publictemplate.rb
+++ b/test/test_view/publictemplate.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/publictemplate'
 require 'htmlgrid/form'
 
@@ -33,7 +33,6 @@ module ODDB
 	module View
 
 class TestPublicTemplate <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @zones    = flexmock('zones', )
     @lnf      = flexmock('lookandfeel', 
diff --git a/test/test_view/resultfoot.rb b/test/test_view/resultfoot.rb
index 3bdc13998..5bbfbe7da 100755
--- a/test/test_view/resultfoot.rb
+++ b/test/test_view/resultfoot.rb
@@ -5,16 +5,15 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resultfoot'
 require 'htmlgrid/span'
 
 module ODDB
 	module View
     class TestExplainResult <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @container = flexmock('container')
         components = {[0,0] => :explain_fachinfo}
@@ -130,7 +129,6 @@ class StubResultFootBuilder < HtmlGrid::Composite
     end
 
     class TestResultFootBuilder <Minitest::Test
-      include FlexMock::TestCase
       def test_result_foot
         @lnf     = flexmock('lookandfeel', 
                             :navigation => [],
@@ -163,7 +161,6 @@ def test_result_foot__legal_note
     end
 
     class TestResultFoot <Minitest::Test
-      include FlexMock::TestCase
       def test_init
         @lnf       = flexmock('lookandfeel', 
                               :navigation => ['navigation'],
diff --git a/test/test_view/resulttemplate.rb b/test/test_view/resulttemplate.rb
index 9d5cdb6ad..2ad7b25aa 100755
--- a/test/test_view/resulttemplate.rb
+++ b/test/test_view/resulttemplate.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 
 module ODDB
@@ -16,7 +16,6 @@ class Session
   module View
     Copyright::ODDB_VERSION = 'version'
     class TestResultTemplate <Minitest::Test
-      include FlexMock::TestCase
       def stderr_null
         require 'tempfile'
         $stderr = Tempfile.open('stderr')
diff --git a/test/test_view/rss/fachinfo.rb b/test/test_view/rss/fachinfo.rb
index 940ef7e6b..4a59b15cd 100755
--- a/test/test_view/rss/fachinfo.rb
+++ b/test/test_view/rss/fachinfo.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/rss/fachinfo'
 require 'model/fachinfo'
 require 'util/today'
@@ -15,7 +15,6 @@ module View
     module Rss
 
 class TestFachinfoItem <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', 
@@ -33,7 +32,6 @@ def test_init
 end
 
 class TestFachinfo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @year      = 2011
     @lnf       = flexmock('lookandfeel',
diff --git a/test/test_view/rss/feedback.rb b/test/test_view/rss/feedback.rb
index 7137b49ac..3ccc7633a 100755
--- a/test/test_view/rss/feedback.rb
+++ b/test/test_view/rss/feedback.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/resulttemplate'
 require 'view/latin1'
@@ -20,7 +20,6 @@ module View
     module Rss
 
 class TestFeedbackTemplate <Minitest::Test
-  include FlexMock::TestCase
   def setup
     flexmock(ODBA.cache, :next_id => 123)
     @lnf      = flexmock('lookandfeel', 
@@ -53,7 +52,6 @@ def test_feedback__package
 end
 
 class TestFeedback <Minitest::Test
-  include FlexMock::TestCase
   def setup
     flexmock(ODBA.cache, :next_id => 123)
     @lnf      = flexmock('lookandfeel', 
diff --git a/test/test_view/rss/package.rb b/test/test_view/rss/package.rb
index c9ee542a3..726fec760 100755
--- a/test/test_view/rss/package.rb
+++ b/test/test_view/rss/package.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/htmlgrid/composite'
 require 'view/rss/package'
 require 'htmlgrid/span'
@@ -20,7 +20,6 @@ module View
     module Rss
 
 class TestPackage <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app')
     @lnf       = flexmock('lookandfeel', 
diff --git a/test/test_view/rss/price_cut.rb b/test/test_view/rss/price_cut.rb
index a78d64b40..9bf9995cb 100755
--- a/test/test_view/rss/price_cut.rb
+++ b/test/test_view/rss/price_cut.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/rss/price_cut'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Rss
 
 class TestPriceCut <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_view/rss/price_rise.rb b/test/test_view/rss/price_rise.rb
index 9ba71bbb9..29cbc4c6f 100755
--- a/test/test_view/rss/price_rise.rb
+++ b/test/test_view/rss/price_rise.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/rss/package'
 require 'view/rss/price_rise'
 
@@ -15,7 +15,6 @@ module View
     module Rss
 
 class TestPriceRise <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_view/rss/sl_introduction.rb b/test/test_view/rss/sl_introduction.rb
index 053738370..f09e8ad76 100755
--- a/test/test_view/rss/sl_introduction.rb
+++ b/test/test_view/rss/sl_introduction.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/rss/sl_introduction'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Rss
 
 class TestSlIntroduction <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_view/searchbar.rb b/test/test_view/searchbar.rb
index 364eb3d87..6757329fc 100755
--- a/test/test_view/searchbar.rb
+++ b/test/test_view/searchbar.rb
@@ -5,9 +5,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/searchbar'
 require 'htmlgrid/select'
 require 'util/session'
@@ -15,7 +15,6 @@
 module ODDB
   module View
     class TestSearchBar <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @container = flexmock('container', :event => 'event')
         @lnf       = flexmock('lookandfeel',
@@ -62,7 +61,6 @@ def test_init
     end
 
     class TestAutocompleteSearchBar <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @container = flexmock('container', :additional_javascripts => [])
         @lnf       = flexmock('lookandfeel',
@@ -107,7 +105,6 @@ def test_to_html
     end
 
     class TestPrescriptionSearchBar <Minitest::Test
-      include FlexMock::TestCase
       def setup
 				@persistent_user_input = flexmock('persistent_user_input', :keys => [])
         @container = flexmock('container', :additional_javascripts => [])
@@ -163,7 +160,6 @@ def test_to_html
     end
 
     class TestSelectSearchForm <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @lnf     = flexmock('lookandfeel',
                             :lookup     => 'lookup',
diff --git a/test/test_view/setpass.rb b/test/test_view/setpass.rb
index 35a58951a..a497e8afa 100755
--- a/test/test_view/setpass.rb
+++ b/test/test_view/setpass.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/setpass'
 
 module ODDB
   module View
 
 class TestSetPassForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/sponsorhead.rb b/test/test_view/sponsorhead.rb
index ab0447981..fe00cac97 100755
--- a/test/test_view/sponsorhead.rb
+++ b/test/test_view/sponsorhead.rb
@@ -8,9 +8,9 @@
 
 require 'stub/odba'
 require 'date'
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/cgi'
 require 'model/sponsor'
 require 'view/sponsorhead'
@@ -29,7 +29,6 @@ def initialize(model, session)
       end
     end
     class TestSponsorMethods <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @zones    = flexmock('zones',
                             :sort_by => [],
diff --git a/test/test_view/sponsorlogo.rb b/test/test_view/sponsorlogo.rb
index 57087e8d7..5eca16310 100755
--- a/test/test_view/sponsorlogo.rb
+++ b/test/test_view/sponsorlogo.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/sponsorlogo'
 require 'htmlgrid/span'
 
@@ -15,7 +15,6 @@ module ODDB
   module View
 
 class TestCompanyLogo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup => 'lookup',
@@ -38,7 +37,6 @@ def test_to_html
 end
 
 class TestSponsorLogo <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup   => 'lookup',
diff --git a/test/test_view/substances/centeredsearchform.rb b/test/test_view/substances/centeredsearchform.rb
index 3e21d9113..6280c4fdb 100755
--- a/test/test_view/substances/centeredsearchform.rb
+++ b/test/test_view/substances/centeredsearchform.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/substances/centeredsearchform'
 
 module ODDB
@@ -14,7 +14,6 @@ module View
     module Substances
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app', :substance_count => 0)
     @lnf       = flexmock('lookandfeel', 
diff --git a/test/test_view/substances/result.rb b/test/test_view/substances/result.rb
index 3b766751a..d6be5ff54 100755
--- a/test/test_view/substances/result.rb
+++ b/test/test_view/substances/result.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/substances/result'
 require 'model/company'
 
@@ -16,7 +16,6 @@ module View
     module Substances
 
 class TestResultComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -49,7 +48,6 @@ def test_title_found
 end
 
 class TestEmptyResultForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/substances/selectsubstance.rb b/test/test_view/substances/selectsubstance.rb
index 533242c6b..21aaf7f77 100755
--- a/test/test_view/substances/selectsubstance.rb
+++ b/test/test_view/substances/selectsubstance.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/inputradio'
 require 'view/substances/selectsubstance'
 
@@ -15,7 +15,6 @@ module View
     module Substances
 
 class TestSelectSubstanceComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/substances/substance.rb b/test/test_view/substances/substance.rb
index 1b8ff7d72..7da62b8d5 100755
--- a/test/test_view/substances/substance.rb
+++ b/test/test_view/substances/substance.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'model/company'
 require 'view/substances/substance'
 
@@ -15,7 +15,6 @@ module View
     module Substances
 
 class TestActiveFormForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -43,7 +42,6 @@ def test_effective_label__has_effective_form
 end
 
 class TestDescriptionForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :languages  => ['de', 'fr'],
@@ -67,7 +65,6 @@ def test_languages
 end
 
 class TestConnectionKeys <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/substances/substances.rb b/test/test_view/substances/substances.rb
index 16f94dae7..450762a67 100755
--- a/test/test_view/substances/substances.rb
+++ b/test/test_view/substances/substances.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/substances/substances'
 require 'model/company'
 
@@ -15,7 +15,6 @@ module View
     module Substances
 
 class TestList <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/suggest_address.rb b/test/test_view/suggest_address.rb
index 79e091df2..0abac805c 100755
--- a/test/test_view/suggest_address.rb
+++ b/test/test_view/suggest_address.rb
@@ -5,16 +5,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/suggest_address'
 
 module ODDB
   module View
 
     class TestSuggestAddressForm <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @lnf      = flexmock('lookandfeel', 
                              :lookup     => 'lookup',
@@ -54,7 +53,6 @@ def test_email_suggestion
     end
 
     class TestSuggestAddressComposite <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @lnf       = flexmock('lookandfeel', 
                               :lookup     => 'lookup',
diff --git a/test/test_view/suggest_address_confirm.rb b/test/test_view/suggest_address_confirm.rb
index 6139cebc7..e9825c396 100755
--- a/test/test_view/suggest_address_confirm.rb
+++ b/test/test_view/suggest_address_confirm.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/labeltext'
 require 'view/suggest_address_confirm'
 
@@ -14,7 +14,6 @@ module ODDB
   module View
 
 class TestAddressSent <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/tab_navigation.rb b/test/test_view/tab_navigation.rb
index fac1c81b1..6fc0e4118 100755
--- a/test/test_view/tab_navigation.rb
+++ b/test/test_view/tab_navigation.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/tab_navigation'
 require 'view/navigationlink'
 module ODDB
   module View
 
 class TestTabNavigation <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup   => 'lookup',
diff --git a/test/test_view/tab_navigationlink.rb b/test/test_view/tab_navigationlink.rb
index 7764c7b1a..f8d323af9 100755
--- a/test/test_view/tab_navigationlink.rb
+++ b/test/test_view/tab_navigationlink.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/tab_navigationlink'
 
 module ODDB
 	module View
 
 class TestTabNavigationLink <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/user/auth_info.rb b/test/test_view/user/auth_info.rb
index aea6a7f9d..0fab1a0b0 100755
--- a/test/test_view/user/auth_info.rb
+++ b/test/test_view/user/auth_info.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/auth_info'
 
 
@@ -15,7 +15,6 @@ module View
     module User
 
 class TestAuthInfoComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/user/autofill.rb b/test/test_view/user/autofill.rb
index 008afac6a..1a280ebb7 100755
--- a/test/test_view/user/autofill.rb
+++ b/test/test_view/user/autofill.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/inputtext'
 require 'view/user/autofill'
 
@@ -23,7 +23,6 @@ def initialize(model, session)
   end
 end
 class TestAutoFill <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/user/centeredsearchform.rb b/test/test_view/user/centeredsearchform.rb
index f747b5cd4..fafc43453 100755
--- a/test/test_view/user/centeredsearchform.rb
+++ b/test/test_view/user/centeredsearchform.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/centeredsearchform'
 
 
@@ -15,7 +15,6 @@ module View
     module User
 
 class TestCenteredSearchComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @app       = flexmock('app',:package_count => 0)
     @lnf       = flexmock('lookandfeel', 
diff --git a/test/test_view/user/download.rb b/test/test_view/user/download.rb
index 6c208d03b..e006b1caa 100755
--- a/test/test_view/user/download.rb
+++ b/test/test_view/user/download.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/resulttemplate'
 require 'htmlgrid/select'
 require 'state/user/download'
@@ -17,7 +17,6 @@ module View
     module User
 
 class TestDownload <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_view/user/download_export.rb b/test/test_view/user/download_export.rb
index b454879d0..ae78cc0f1 100755
--- a/test/test_view/user/download_export.rb
+++ b/test/test_view/user/download_export.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../../', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/select'
 require 'htmlgrid/labeltext'
 require 'htmlgrid/template'
@@ -20,7 +20,6 @@
 
 
 class TestDownloadExportInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:lookup).and_return('lookup')
@@ -42,7 +41,6 @@ def test_compression_label
 end
 
 class TestDownloadExportComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     lookandfeel = flexmock('lookandfeel') do |l|
       l.should_receive(:lookup).and_return('lookup')
diff --git a/test/test_view/user/export.rb b/test/test_view/user/export.rb
index 77351dbaf..956456cd5 100755
--- a/test/test_view/user/export.rb
+++ b/test/test_view/user/export.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/export'
 require 'htmlgrid/link'
 require 'htmlgrid/inputcheckbox'
@@ -39,7 +39,6 @@ def initialize(model, session)
       end
 
 class TestExport <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/user/fipi_offer_confirm.rb b/test/test_view/user/fipi_offer_confirm.rb
index babf4c75a..2e040f0d8 100755
--- a/test/test_view/user/fipi_offer_confirm.rb
+++ b/test/test_view/user/fipi_offer_confirm.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../../', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/fipi_offer_confirm'
 
 module ODDB
@@ -15,7 +15,6 @@ module View
     module User
 
 class TestFiPiCalculations <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', :lookandfeel => @lnf)
@@ -45,7 +44,6 @@ def test_init
 end
 
 class TestFiPiOfferConfirmComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/user/fipi_offer_input.rb b/test/test_view/user/fipi_offer_input.rb
index 5bb887718..b81f06ffd 100755
--- a/test/test_view/user/fipi_offer_input.rb
+++ b/test/test_view/user/fipi_offer_input.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../../', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/fipi_offer_input'
 
 module ODDB
@@ -15,7 +15,6 @@ module View
     module User
 
 class TestFiPiRadioButtons <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -46,7 +45,6 @@ def test_radio_text__pi
 end
 
 class TestRadioButton <Minitest::Test
-  include FlexMock::TestCase
   def test_checked
     @button = ODDB::View::User::FiPiOfferInputForm::RadioButton.new('name', 'value', 'current')
     assert_equal(false, @button.checked?)
@@ -56,7 +54,6 @@ def test_checked
 end
 
 class TestFiPiOfferInputForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -76,7 +73,6 @@ def test_fi_quantity_txt
 end
 
 class TestFiPiOfferInputComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/user/help.rb b/test/test_view/user/help.rb
index cfe1f5aa0..fa7b1b0e9 100755
--- a/test/test_view/user/help.rb
+++ b/test/test_view/user/help.rb
@@ -5,9 +5,9 @@
 #$: << File.expand_path('../../', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/help'
 
 module ODDB
@@ -15,7 +15,6 @@ module View
     module User
 
 class TestHelpComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/user/invalid_user.rb b/test/test_view/user/invalid_user.rb
index 01ce50785..39cd5c26a 100755
--- a/test/test_view/user/invalid_user.rb
+++ b/test/test_view/user/invalid_user.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/errormessage'
 require 'htmlgrid/inputradio'
 require 'view/user/invalid_user'
@@ -17,7 +17,6 @@ module View
     module User
 
 class TestInvalidUserComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/user/mailinglist.rb b/test/test_view/user/mailinglist.rb
index 92533c319..9eab03bcd 100755
--- a/test/test_view/user/mailinglist.rb
+++ b/test/test_view/user/mailinglist.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/mailinglist'
 
 
@@ -15,7 +15,6 @@ module View
     module User
 
 class TestMailingListForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -32,7 +31,6 @@ def test_subscribe
 end
 
 class TestMailingListInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -54,7 +52,6 @@ def test_init
 end
 
 class TestMailingListComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/user/passthru.rb b/test/test_view/user/passthru.rb
index 6c3af4d65..448f153b0 100755
--- a/test/test_view/user/passthru.rb
+++ b/test/test_view/user/passthru.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/passthru'
 
 
@@ -15,7 +15,6 @@ module View
     module User
 
 class TestPassThru <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_view/user/plugin.rb b/test/test_view/user/plugin.rb
index 9c65507cc..50aec2008 100755
--- a/test/test_view/user/plugin.rb
+++ b/test/test_view/user/plugin.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/plugin'
 require 'view/logo'
 
@@ -19,7 +19,6 @@ class Session
     module User
 
 class TestPluginInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
@@ -52,7 +51,6 @@ def test_plugin_description__language_en
 end
 
 class TestPlugin <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/user/powerlink.rb b/test/test_view/user/powerlink.rb
index 33cab63c6..047cd6691 100755
--- a/test/test_view/user/powerlink.rb
+++ b/test/test_view/user/powerlink.rb
@@ -5,16 +5,15 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/powerlink'
 
 module ODDB
 	module View
 		module User
 class TestPowerLink <Minitest::Test
-  include FlexMock::TestCase
 	class StubSession
 		def lookandfeel
 			self
diff --git a/test/test_view/user/preferences.rb b/test/test_view/user/preferences.rb
index db5dfa26f..021ee41a0 100755
--- a/test/test_view/user/preferences.rb
+++ b/test/test_view/user/preferences.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../..', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/cgi'
 require 'view/user/preferences'
 
@@ -32,7 +32,6 @@ class StubPublicTemplate < PublicTemplate
 module ODDB
   module View
     class TestZsr <Minitest::Test
-      include FlexMock::TestCase
       def test_zsr
         @lnf     = flexmock('lookandfeel', 
                             :lookup     => 'lookup',
diff --git a/test/test_view/user/register_download.rb b/test/test_view/user/register_download.rb
index dee931088..6957f781f 100755
--- a/test/test_view/user/register_download.rb
+++ b/test/test_view/user/register_download.rb
@@ -5,9 +5,9 @@
 $: << File.expand_path('../../', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/list'
 require 'htmlgrid/pass'
 require 'view/user/register_download'
@@ -28,7 +28,6 @@ module View
     module User
 
 class TestRegisterDownloadForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :attributes => {},
@@ -72,7 +71,6 @@ def test_hidden_fields
 end
 
 class TestRegisterDownloadComposite <Minitest::Test
-  include FlexMock::TestCase
   def test_register_download_form
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/user/register_poweruser.rb b/test/test_view/user/register_poweruser.rb
index acb01f126..0a8d96058 100755
--- a/test/test_view/user/register_poweruser.rb
+++ b/test/test_view/user/register_poweruser.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/select'
 require 'view/user/register_poweruser'
 
@@ -16,7 +16,6 @@ module View
     module User
 
 class TestRegisterPowerUserForm  <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
@@ -41,7 +40,6 @@ def test_init
 end
 
 class TestRenewPowerUserComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/user/sponsorlink.rb b/test/test_view/user/sponsorlink.rb
index 128bb5259..5fe6aaf7f 100755
--- a/test/test_view/user/sponsorlink.rb
+++ b/test/test_view/user/sponsorlink.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'htmlgrid/passthru'
 require 'view/user/sponsorlink'
 require 'util/logfile'
@@ -17,7 +17,6 @@ module View
     module User
 
 class TestSponsorLink <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', :lookup => 'lookup')
     @session = flexmock('session', 
diff --git a/test/test_view/user/yamlexport.rb b/test/test_view/user/yamlexport.rb
index 2e213f618..78638b36c 100755
--- a/test/test_view/user/yamlexport.rb
+++ b/test/test_view/user/yamlexport.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/yamlexport'
 
 
@@ -20,7 +20,6 @@ def link_with_filesize(arg)
   end
 end
 class TestYamlExportInnerComposite <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_view/user/yweseecontact.rb b/test/test_view/user/yweseecontact.rb
index 9a365b70c..088cfdea9 100755
--- a/test/test_view/user/yweseecontact.rb
+++ b/test/test_view/user/yweseecontact.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/user/yweseecontact'
 
 
@@ -15,7 +15,6 @@ module View
     module User
 
 class TestYweseeContactForm <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf     = flexmock('lookandfeel', 
                         :lookup     => 'lookup',
diff --git a/test/test_view/vcard.rb b/test/test_view/vcard.rb
index 4c37c1b0d..ce489dc64 100755
--- a/test/test_view/vcard.rb
+++ b/test/test_view/vcard.rb
@@ -4,16 +4,15 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/vcard'
 
 module ODDB
   module View
 
 class TestVCard <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @lnf       = flexmock('lookandfeel', :lookup => 'lookup')
     @session   = flexmock('session', :lookandfeel => @lnf)
diff --git a/test/test_view/welcomehead.rb b/test/test_view/welcomehead.rb
index 6a5ba31ff..a299c078a 100755
--- a/test/test_view/welcomehead.rb
+++ b/test/test_view/welcomehead.rb
@@ -4,9 +4,9 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/welcomehead'
 
 module ODDB
@@ -17,7 +17,6 @@ module View
 
 
 class TestWelcomeHead <Minitest::Test
-  include FlexMock::TestCase
   def setup_welcome(lnf = nil)
     lnf ? @lnf = lnf : @lnf       = flexmock('lookandfeel', 
                           :lookup     => 'lookup',
diff --git a/test/test_view/zsr.rb b/test/test_view/zsr.rb
index 00bbef959..99be002c3 100755
--- a/test/test_view/zsr.rb
+++ b/test/test_view/zsr.rb
@@ -5,16 +5,15 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'stub/cgi'
 require 'view/zsr'
 
 module ODDB
 	module View
 		class TestZsr <Minitest::Test
-			include FlexMock::TestCase
 			def test_zsr
 				@lnf     = flexmock('lookandfeel', 
 														:lookup     => 'lookup',
diff --git a/test/test_view/zsr_json.rb b/test/test_view/zsr_json.rb
index 181bf5f8a..c450fe442 100755
--- a/test/test_view/zsr_json.rb
+++ b/test/test_view/zsr_json.rb
@@ -4,15 +4,14 @@
 
 $: << File.expand_path("../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'view/zsr_json'
 
 module ODDB
 	module View   
 		class TestZsrJson <Minitest::Test
-			include FlexMock::TestCase
 			def test_zsr
 				@lnf     = flexmock('lookandfeel', 
 														:lookup     => 'lookup',