diff --git a/test/runtests.jl b/test/runtests.jl
index 9074739..58270dc 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -252,7 +252,9 @@ end
 
 #-------------------------------------------------------------------------------
 lisp"(import ParserCombinator)"
-@test lisp"(@E_str \"S\")" == E"S"
+@testset "Module import" begin
+    @test lisp"(@E_str \"S\")" == E"S"
+end
 
 #-------------------------------------------------------------------------------
 @testset "Include from file" begin
@@ -265,19 +267,19 @@ lisp"(import ParserCombinator)"
     @test !isdefined(@__MODULE__, :not_a_global)
 end
 
-# ----------------------------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 # Bug reports
-# ----------------------------------------------------------------------------------------------------------------------
-@test lisp"""(def game_map (Dict
-          (=> 'living_room
-              '((you are in the living room
-                 of a wizards house - there is a wizard
-                 snoring loudly on the couch -)
-                (west door garden)
-                (upstairs stairway attic)))))""" == Dict(:living_room =>
-                                                         Any[ Any[ :you, :are, :in, :the, :living, :room, :of, :a, :wizards, :house, :-,
-                                                                   :there, :is, :a, :wizard, :snoring, :loudly, :on, :the, :couch, :- ],
-                                                              Any[ :west, :door, :garden ],
-                                                              Any[ :upstairs, :stairway, :attic ] ])
-
-
+@testset "Bug reports" begin
+    @test lisp"""(def game_map (Dict
+              (=> 'living_room
+                  '((you are in the living room
+                     of a wizards house - there is a wizard
+                     snoring loudly on the couch -)
+                    (west door garden)
+                    (upstairs stairway attic)))))""" ==
+                    Dict(:living_room =>
+                         Any[ Any[ :you, :are, :in, :the, :living, :room, :of, :a, :wizards, :house, :-,
+                                  :there, :is, :a, :wizard, :snoring, :loudly, :on, :the, :couch, :- ],
+                             Any[ :west, :door, :garden ],
+                             Any[ :upstairs, :stairway, :attic ] ])
+end