diff --git a/lib/csys/environ.ex b/lib/csys/environ.ex
index 783124b..bf51dbb 100644
--- a/lib/csys/environ.ex
+++ b/lib/csys/environ.ex
@@ -39,7 +39,6 @@ defmodule Scopes.CSys.Environ do
     state1 = %State{cells: cells, init_seq: seq}
     CSys.update({state1, proc, syns, env})
     if step do
-      #Process.sleep(1)
       step.(state1)
     end
   end
diff --git a/test/core_test.exs b/test/core/actor_test.exs
similarity index 93%
rename from test/core_test.exs
rename to test/core/actor_test.exs
index cf7f11f..634d10f 100644
--- a/test/core_test.exs
+++ b/test/core/actor_test.exs
@@ -1,4 +1,4 @@
-defmodule Scopes.CoreTest do
+defmodule Scopes.CoreActorTest do
   use ExUnit.Case, async: true
   alias Scopes.Core.Actor
 
diff --git a/test/csys_test.exs b/test/core/core_test.exs
similarity index 94%
rename from test/csys_test.exs
rename to test/core/core_test.exs
index c116f66..4508f4e 100644
--- a/test/csys_test.exs
+++ b/test/core/core_test.exs
@@ -1,8 +1,7 @@
-defmodule Scopes.CSysTest do
+defmodule Scopes.CoreTest do
   use ExUnit.Case, async: false
   @moduletag timeout: 5000
 
-  #alias Scopes.CSys
   alias Scopes.CSys.Environ
   alias Scopes.CSys.Program
   alias Scopes.Shape
@@ -16,7 +15,7 @@ defmodule Scopes.CSysTest do
     Shape.data(receive_select(head))
   end
 
-  describe "basic-program:" do
+  describe "core-basic:" do
     test "minimal-b1" do
       env = Environ.setup(Program.prepare_basic(), Program.init_seq_b1())
       Process.sleep(50)
diff --git a/test/shape_test.exs b/test/core/shape_test.exs
similarity index 86%
rename from test/shape_test.exs
rename to test/core/shape_test.exs
index 55c6abf..acd12f2 100644
--- a/test/shape_test.exs
+++ b/test/core/shape_test.exs
@@ -1,4 +1,4 @@
-defmodule Scopes.ShapeTest do
+defmodule Scopes.CoreShapeTest do
   use ExUnit.Case, async: true
 
   alias Scopes.Shape
diff --git a/test/util_test.exs b/test/core/util_test.exs
similarity index 87%
rename from test/util_test.exs
rename to test/core/util_test.exs
index 07eb9b2..b90d3d5 100644
--- a/test/util_test.exs
+++ b/test/core/util_test.exs
@@ -1,4 +1,4 @@
-defmodule Scopes.UtilTest do
+defmodule Scopes.CoreUtilTest do
   use ExUnit.Case, async: true
 
   alias Scopes.Util