diff --git a/100_core/tst/gplx/core/ios/IoEngine_dir_basic_base.java b/100_core/tst/gplx/core/ios/IoEngine_dir_basic_base_tst.java
similarity index 75%
rename from 100_core/tst/gplx/core/ios/IoEngine_dir_basic_base.java
rename to 100_core/tst/gplx/core/ios/IoEngine_dir_basic_base_tst.java
index 673a24673..41035b8c5 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_dir_basic_base.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_dir_basic_base_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*;
-public abstract class IoEngine_dir_basic_base {
+public abstract class IoEngine_dir_basic_base_tst {
 	@Before public void setup() {
 		engine = engine_();
 		fx = IoEngineFxt.new_();
@@ -58,20 +58,20 @@ public abstract class IoEngine_dir_basic_base {
 		
 		fx.tst_ScanDir(root, dir1, fil);
 	}
-	@Test public void MoveDir() {
-	Io_url src = root.GenSubDir_nest("src"), trg = root.GenSubDir_nest("trg");
-	engine.CreateDir(src);
-	fx.tst_ExistsPaths(true, src); fx.tst_ExistsPaths(false, trg);
-
-	engine.MoveDir(src, trg);
-	fx.tst_ExistsPaths(false, src); fx.tst_ExistsPaths(true, trg);
-}
-@Test @gplx.Virtual public void CopyDir() {
-	Io_url src = root.GenSubDir_nest("src"), trg = root.GenSubDir_nest("trg");
-	engine.CreateDir(src);
-	fx.tst_ExistsPaths(true, src); fx.tst_ExistsPaths(false, trg);
-
-	engine.CopyDir(src, trg);
-	fx.tst_ExistsPaths(true, src, trg);
-}
-}
\ No newline at end of file
+		@Test  public void MoveDir() {
+		Io_url src = root.GenSubDir_nest("src"), trg = root.GenSubDir_nest("trg");
+		engine.CreateDir(src);
+		fx.tst_ExistsPaths(true, src); fx.tst_ExistsPaths(false, trg);
+	
+		engine.MoveDir(src, trg);
+		fx.tst_ExistsPaths(false, src); fx.tst_ExistsPaths(true, trg);
+	}
+	@Test  @gplx.Virtual public void CopyDir() {
+		Io_url src = root.GenSubDir_nest("src"), trg = root.GenSubDir_nest("trg");
+		engine.CreateDir(src);
+		fx.tst_ExistsPaths(true, src); fx.tst_ExistsPaths(false, trg);
+	
+		engine.CopyDir(src, trg);
+		fx.tst_ExistsPaths(true, src, trg);
+	}
+	}
\ No newline at end of file
diff --git a/100_core/tst/gplx/core/ios/IoEngine_dir_basic_memory_tst.java b/100_core/tst/gplx/core/ios/IoEngine_dir_basic_memory_tst.java
index f29e81d02..7cbee6f78 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_dir_basic_memory_tst.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_dir_basic_memory_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*;
-public class IoEngine_dir_basic_memory_tst extends IoEngine_dir_basic_base {
+public class IoEngine_dir_basic_memory_tst extends IoEngine_dir_basic_base_tst {
 	@Override protected void setup_hook() {
 		root = Io_url_.mem_dir_("mem");
 	}	@Override protected IoEngine engine_() {return IoEngine_.Mem_init_();}
diff --git a/100_core/tst/gplx/core/ios/IoEngine_dir_basic_system_tst.java b/100_core/tst/gplx/core/ios/IoEngine_dir_basic_system_tst.java
index 7b4585908..3b2790193 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_dir_basic_system_tst.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_dir_basic_system_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*;
-public class IoEngine_dir_basic_system_tst extends IoEngine_dir_basic_base {
+public class IoEngine_dir_basic_system_tst extends IoEngine_dir_basic_base_tst {
 	@Override protected void setup_hook() {
 		root = Tfds.RscDir.GenSubDir_nest("100_core", "ioEngineTest", "_temp");
 		IoEngine_xrg_deleteDir.new_(root).Recur_().ReadOnlyFails_off().Exec();
diff --git a/100_core/tst/gplx/core/ios/IoEngine_dir_deep_base.java b/100_core/tst/gplx/core/ios/IoEngine_dir_deep_base_tst.java
similarity index 96%
rename from 100_core/tst/gplx/core/ios/IoEngine_dir_deep_base.java
rename to 100_core/tst/gplx/core/ios/IoEngine_dir_deep_base_tst.java
index d7370c58d..087d8f59e 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_dir_deep_base.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_dir_deep_base_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*;
-public abstract class IoEngine_dir_deep_base {
+public abstract class IoEngine_dir_deep_base_tst {
 	@Before public void setup() {
 		engine = engine_();
 		fx = IoEngineFxt.new_();
diff --git a/100_core/tst/gplx/core/ios/IoEngine_dir_deep_memory_tst.java b/100_core/tst/gplx/core/ios/IoEngine_dir_deep_memory_tst.java
index 42ada730e..9e0e104f4 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_dir_deep_memory_tst.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_dir_deep_memory_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*;
-public class IoEngine_dir_deep_memory_tst extends IoEngine_dir_deep_base {
+public class IoEngine_dir_deep_memory_tst extends IoEngine_dir_deep_base_tst {
 	@Override protected void setup_hook() {
 		root = Io_url_.mem_dir_("mem/root");
 	}	@Override protected IoEngine engine_() {return IoEngine_.Mem_init_();}
diff --git a/100_core/tst/gplx/core/ios/IoEngine_dir_deep_system_tst.java b/100_core/tst/gplx/core/ios/IoEngine_dir_deep_system_tst.java
index 81d4809d3..9abe52113 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_dir_deep_system_tst.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_dir_deep_system_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*;
-public class IoEngine_dir_deep_system_tst extends IoEngine_dir_deep_base {
+public class IoEngine_dir_deep_system_tst extends IoEngine_dir_deep_base_tst {
 	@Override protected void setup_hook() {
 		root = Tfds.RscDir.GenSubDir_nest("100_core", "ioEngineTest", "_temp");
 		IoEngine_xrg_deleteDir.new_(root).Recur_().ReadOnlyFails_off().Exec();
diff --git a/100_core/tst/gplx/core/ios/IoEngine_fil_basic_base.java b/100_core/tst/gplx/core/ios/IoEngine_fil_basic_base_tst.java
similarity index 96%
rename from 100_core/tst/gplx/core/ios/IoEngine_fil_basic_base.java
rename to 100_core/tst/gplx/core/ios/IoEngine_fil_basic_base_tst.java
index 3a9873dd3..a7f874a16 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_fil_basic_base.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_fil_basic_base_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*; import gplx.core.texts.*;/*EncodingAdp_*/ import gplx.core.ios.streams.*;
-public abstract class IoEngine_fil_basic_base {
+public abstract class IoEngine_fil_basic_base_tst {
 	@Before public void setup() {
 		engine = engine_();
 		fx = IoEngineFxt.new_();
diff --git a/100_core/tst/gplx/core/ios/IoEngine_fil_basic_memory_tst.java b/100_core/tst/gplx/core/ios/IoEngine_fil_basic_memory_tst.java
index 654d6cc88..5580105d6 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_fil_basic_memory_tst.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_fil_basic_memory_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*;
-public class IoEngine_fil_basic_memory_tst extends IoEngine_fil_basic_base {
+public class IoEngine_fil_basic_memory_tst extends IoEngine_fil_basic_base_tst {
 	@Override protected IoEngine engine_() {return IoEngine_.Mem_init_();}
 	@Override protected void setup_hook() {
 		root = Io_url_.mem_dir_("mem");
diff --git a/100_core/tst/gplx/core/ios/IoEngine_fil_basic_system_tst.java b/100_core/tst/gplx/core/ios/IoEngine_fil_basic_system_tst.java
index edd7593bb..b5836a3b6 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_fil_basic_system_tst.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_fil_basic_system_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*;
-public class IoEngine_fil_basic_system_tst extends IoEngine_fil_basic_base {
+public class IoEngine_fil_basic_system_tst extends IoEngine_fil_basic_base_tst {
 	@Override protected void setup_hook() {
 		root = Tfds.RscDir.GenSubDir_nest("100_core", "ioEngineTest", "_temp");
 		fil = root.GenSubFil("fil.txt");
diff --git a/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_base.java b/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_base_tst.java
similarity index 96%
rename from 100_core/tst/gplx/core/ios/IoEngine_fil_xfer_base.java
rename to 100_core/tst/gplx/core/ios/IoEngine_fil_xfer_base_tst.java
index f917183c0..30cd6087e 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_base.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_base_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*;
-public abstract class IoEngine_fil_xfer_base {
+public abstract class IoEngine_fil_xfer_base_tst {
 	@Before public void setup() {
 		engine = engine_();
 		fx = IoEngineFxt.new_();
diff --git a/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_memory_tst.java b/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_memory_tst.java
index 7be19bb76..c50cee7e3 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_memory_tst.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_memory_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*;
-public class IoEngine_fil_xfer_memory_tst extends IoEngine_fil_xfer_base {
+public class IoEngine_fil_xfer_memory_tst extends IoEngine_fil_xfer_base_tst {
 	@Override protected void setup_hook() {
 		root = Io_url_.mem_dir_("mem");
 	}	@Override protected IoEngine engine_() {return IoEngine_.Mem_init_();}
diff --git a/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_system_tst.java b/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_system_tst.java
index 5c6a5955c..2aebb2202 100644
--- a/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_system_tst.java
+++ b/100_core/tst/gplx/core/ios/IoEngine_fil_xfer_system_tst.java
@@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.core.ios; import gplx.*; import gplx.core.*;
 import org.junit.*;
-public class IoEngine_fil_xfer_system_tst extends IoEngine_fil_xfer_base {
+public class IoEngine_fil_xfer_system_tst extends IoEngine_fil_xfer_base_tst {
 	@Override protected void setup_hook() {
 		root = Tfds.RscDir.GenSubDir_nest("100_core", "ioEngineTest", "_temp");
 		IoEngine_xrg_deleteDir.new_(root.OwnerDir()).Recur_().ReadOnlyFails_off().Exec();