diff --git a/src/sourcery/test_s.f90 b/src/sourcery/test_s.f90
index d3c858c9..57591a66 100644
--- a/src/sourcery/test_s.f90
+++ b/src/sourcery/test_s.f90
@@ -5,7 +5,6 @@
 contains
 
   module procedure report
-    integer i
 
     associate(me => this_image())
       if (me==1) print *, new_line('a'), test%subject()
@@ -13,9 +12,12 @@
         associate(num_tests => size(test_results))
           tests = tests + num_tests
           if (me==1) then
-            do i=1,num_tests
-              if (me==1) print *,"   ",test_results(i)%characterize()
-            end do
+            block
+              integer i
+              do i=1,num_tests
+                if (me==1) print *,"   ",test_results(i)%characterize()
+              end do
+            end block
           end if
           block 
             logical, allocatable :: passing_tests(:)
diff --git a/src/sourcery_m.f90 b/src/sourcery_m.f90
index 9255439c..d176acf2 100644
--- a/src/sourcery_m.f90
+++ b/src/sourcery_m.f90
@@ -1,18 +1,20 @@
 module sourcery_m
   !! export all public entities from every other sourcery module
-  implicit none
+  use command_line_m, only : command_line_t
+  use data_partition_m, only : data_partition_t
+  use formats_m, only : formats_t
+  use file_m, only : file_t
+  use string_m, only : string_t
+  use test_result_m, only : test_result_t
+  use test_m, only : test_t
+  use user_defined_collectives_m, only : co_all
 
-  use command_line_m
-  use string_m
-  use file_m
-  use test_result_m
-  use formats_m
-  use oracle_m
-  use object_m
-  use user_defined_collectives_m
-  use data_partition_m
-  use test_m
+  !! legacy modules (likely to be removed in a future release):
+  use object_m, only : object_t
+  use co_object_m, only : co_object_t
+  use oracle_m, only : oracle_t
   use units_m
-  use co_object_m
+
+  implicit none
 
 end module sourcery_m