diff --git a/test/FreeGroup-tests.jl b/test/FreeGroup-tests.jl
index b412e90..507a68c 100644
--- a/test/FreeGroup-tests.jl
+++ b/test/FreeGroup-tests.jl
@@ -29,8 +29,8 @@ end
    s = Groups.FreeSymbol("s")
    t = Groups.FreeSymbol("t", -2)
 
-   @test isa(Groups.GWord(s), Groups.GWord)
-   @test isa(Groups.GWord(s), FreeGroupElem)
+   @test isa(Groups.GroupWord(s), Groups.GWord{Groups.FreeSymbol})
+   @test isa(Groups.GroupWord(s), FreeGroupElem)
    @test isa(FreeGroupElem(s), Groups.GWord)
    @test isa(convert(FreeGroupElem, s), Groups.GWord)
    @test isa(convert(FreeGroupElem, s), FreeGroupElem)
@@ -56,7 +56,7 @@ end
 
    @testset "internal arithmetic" begin
 
-      @test_broken Vector{Groups.GWord}([s,t]) == [Groups.GWord(s), Groups.GWord(t)]
+      @test_broken Vector{Groups.FreeGroupElem}([s,t]) == [Groups.GroupWord(s), Groups.GroupWord(t)]
       @test (s*s).symbols == (s^2).symbols
       @test hash([t^1,s^1]) == hash([t^2*inv(t),s*inv(s)*s])
 
@@ -111,10 +111,10 @@ end
    @testset "replacements" begin
       a = Groups.FreeSymbol("a")
       b = Groups.FreeSymbol("b")
-      @test Groups.is_subsymbol(a, Groups.change_pow(a,2)) == true
-      @test Groups.is_subsymbol(a, Groups.change_pow(a,-2)) == false
-      @test Groups.is_subsymbol(b, Groups.change_pow(a,-2)) == false
-      @test Groups.is_subsymbol(inv(b), Groups.change_pow(b,-2)) == true
+      @test Groups.issubsymbol(a, Groups.change_pow(a,2)) == true
+      @test Groups.issubsymbol(a, Groups.change_pow(a,-2)) == false
+      @test Groups.issubsymbol(b, Groups.change_pow(a,-2)) == false
+      @test Groups.issubsymbol(inv(b), Groups.change_pow(b,-2)) == true
 
       c = s*t*s^-1*t^-1
       @test findfirst(c, s^-1*t^-1) == 3
diff --git a/test/runtests.jl b/test/runtests.jl
index d85ec40..346a89e 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,8 +1,6 @@
 using Groups
 using Base.Test
 
-# write your own tests here
-
 @testset "Groups" begin
    include("FreeGroup-tests.jl")
    include("AutGroup-tests.jl")