diff --git a/go/tests/tofix/func/test_btreeapplybylevel.go b/go/tests/func/btreeapplybylevel_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreeapplybylevel.go
rename to go/tests/func/btreeapplybylevel_test/main.go
diff --git a/go/tests/tofix/func/test_btreeapplyinorder.go b/go/tests/func/btreeapplyinorder_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreeapplyinorder.go
rename to go/tests/func/btreeapplyinorder_test/main.go
diff --git a/go/tests/tofix/func/test_btreeapplypostorder.go b/go/tests/func/btreeapplypostorder_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreeapplypostorder.go
rename to go/tests/func/btreeapplypostorder_test/main.go
diff --git a/go/tests/tofix/func/test_btreeapplypreorder.go b/go/tests/func/btreeapplypreorder_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreeapplypreorder.go
rename to go/tests/func/btreeapplypreorder_test/main.go
diff --git a/go/tests/tofix/func/test_btreedeletenode.go b/go/tests/func/btreedeletenode_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreedeletenode.go
rename to go/tests/func/btreedeletenode_test/main.go
diff --git a/go/tests/tofix/func/test_btreeinsertdata.go b/go/tests/func/btreeinsertdata_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreeinsertdata.go
rename to go/tests/func/btreeinsertdata_test/main.go
diff --git a/go/tests/tofix/func/test_btreeisbinary.go b/go/tests/func/btreeisbinary_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreeisbinary.go
rename to go/tests/func/btreeisbinary_test/main.go
diff --git a/go/tests/tofix/func/test_btreelevelcount.go b/go/tests/func/btreelevelcount_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreelevelcount.go
rename to go/tests/func/btreelevelcount_test/main.go
diff --git a/go/tests/tofix/func/test_btreemax.go b/go/tests/func/btreemax_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreemax.go
rename to go/tests/func/btreemax_test/main.go
diff --git a/go/tests/tofix/func/test_btreemin.go b/go/tests/func/btreemin_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreemin.go
rename to go/tests/func/btreemin_test/main.go
diff --git a/go/tests/tofix/func/test_btreesearchitem.go b/go/tests/func/btreesearchitem_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreesearchitem.go
rename to go/tests/func/btreesearchitem_test/main.go
diff --git a/go/tests/tofix/func/test_btreetransplant.go b/go/tests/func/btreetransplant_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_btreetransplant.go
rename to go/tests/func/btreetransplant_test/main.go
diff --git a/go/tests/tofix/func/correct/btree.go b/go/tests/func/correct/btree.go
similarity index 100%
rename from go/tests/tofix/func/correct/btree.go
rename to go/tests/func/correct/btree.go
diff --git a/go/tests/tofix/func/correct/challenge.go b/go/tests/func/correct/challenge.go
similarity index 100%
rename from go/tests/tofix/func/correct/challenge.go
rename to go/tests/func/correct/challenge.go
diff --git a/go/tests/tofix/func/correct/listat.go b/go/tests/func/correct/listat.go
similarity index 100%
rename from go/tests/tofix/func/correct/listat.go
rename to go/tests/func/correct/listat.go
diff --git a/go/tests/tofix/func/correct/listclear.go b/go/tests/func/correct/listclear.go
similarity index 100%
rename from go/tests/tofix/func/correct/listclear.go
rename to go/tests/func/correct/listclear.go
diff --git a/go/tests/tofix/func/correct/listfind.go b/go/tests/func/correct/listfind.go
similarity index 100%
rename from go/tests/tofix/func/correct/listfind.go
rename to go/tests/func/correct/listfind.go
diff --git a/go/tests/tofix/func/correct/listforeach.go b/go/tests/func/correct/listforeach.go
similarity index 100%
rename from go/tests/tofix/func/correct/listforeach.go
rename to go/tests/func/correct/listforeach.go
diff --git a/go/tests/tofix/func/correct/listforeachif.go b/go/tests/func/correct/listforeachif.go
similarity index 100%
rename from go/tests/tofix/func/correct/listforeachif.go
rename to go/tests/func/correct/listforeachif.go
diff --git a/go/tests/tofix/func/correct/listlast.go b/go/tests/func/correct/listlast.go
similarity index 100%
rename from go/tests/tofix/func/correct/listlast.go
rename to go/tests/func/correct/listlast.go
diff --git a/go/tests/tofix/func/correct/listmerge.go b/go/tests/func/correct/listmerge.go
similarity index 100%
rename from go/tests/tofix/func/correct/listmerge.go
rename to go/tests/func/correct/listmerge.go
diff --git a/go/tests/tofix/func/correct/listpushback.go b/go/tests/func/correct/listpushback.go
similarity index 100%
rename from go/tests/tofix/func/correct/listpushback.go
rename to go/tests/func/correct/listpushback.go
diff --git a/go/tests/tofix/func/correct/listpushfront.go b/go/tests/func/correct/listpushfront.go
similarity index 100%
rename from go/tests/tofix/func/correct/listpushfront.go
rename to go/tests/func/correct/listpushfront.go
diff --git a/go/tests/tofix/func/correct/listremoveif.go b/go/tests/func/correct/listremoveif.go
similarity index 100%
rename from go/tests/tofix/func/correct/listremoveif.go
rename to go/tests/func/correct/listremoveif.go
diff --git a/go/tests/tofix/func/correct/listreverse.go b/go/tests/func/correct/listreverse.go
similarity index 100%
rename from go/tests/tofix/func/correct/listreverse.go
rename to go/tests/func/correct/listreverse.go
diff --git a/go/tests/tofix/func/correct/listsize.go b/go/tests/func/correct/listsize.go
similarity index 100%
rename from go/tests/tofix/func/correct/listsize.go
rename to go/tests/func/correct/listsize.go
diff --git a/go/tests/tofix/func/correct/listsort.go b/go/tests/func/correct/listsort.go
similarity index 100%
rename from go/tests/tofix/func/correct/listsort.go
rename to go/tests/func/correct/listsort.go
diff --git a/go/tests/tofix/func/correct/sortedlistmerge.go b/go/tests/func/correct/sortedlistmerge.go
similarity index 100%
rename from go/tests/tofix/func/correct/sortedlistmerge.go
rename to go/tests/func/correct/sortedlistmerge.go
diff --git a/go/tests/tofix/func/correct/sortlistinsert.go b/go/tests/func/correct/sortlistinsert.go
similarity index 100%
rename from go/tests/tofix/func/correct/sortlistinsert.go
rename to go/tests/func/correct/sortlistinsert.go
diff --git a/go/tests/tofix/func/test_listat.go b/go/tests/func/listat_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listat.go
rename to go/tests/func/listat_test/main.go
diff --git a/go/tests/tofix/func/test_listclear.go b/go/tests/func/listclear_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listclear.go
rename to go/tests/func/listclear_test/main.go
diff --git a/go/tests/tofix/func/test_listfind.go b/go/tests/func/listfind_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listfind.go
rename to go/tests/func/listfind_test/main.go
diff --git a/go/tests/tofix/func/test_listforeach.go b/go/tests/func/listforeach_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listforeach.go
rename to go/tests/func/listforeach_test/main.go
diff --git a/go/tests/tofix/func/test_listforeachif.go b/go/tests/func/listforeachif_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listforeachif.go
rename to go/tests/func/listforeachif_test/main.go
diff --git a/go/tests/tofix/func/test_listlast.go b/go/tests/func/listlast_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listlast.go
rename to go/tests/func/listlast_test/main.go
diff --git a/go/tests/tofix/func/test_listmerge.go b/go/tests/func/listmerge_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listmerge.go
rename to go/tests/func/listmerge_test/main.go
diff --git a/go/tests/tofix/func/test_listpushback.go b/go/tests/func/listpushback_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listpushback.go
rename to go/tests/func/listpushback_test/main.go
diff --git a/go/tests/tofix/func/test_listpushfront.go b/go/tests/func/listpushfront_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listpushfront.go
rename to go/tests/func/listpushfront_test/main.go
diff --git a/go/tests/tofix/func/test_listremoveif.go b/go/tests/func/listremoveif_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listremoveif.go
rename to go/tests/func/listremoveif_test/main.go
diff --git a/go/tests/tofix/func/test_listreverse.go b/go/tests/func/listreverse_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listreverse.go
rename to go/tests/func/listreverse_test/main.go
diff --git a/go/tests/tofix/func/test_listsize.go b/go/tests/func/listsize_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listsize.go
rename to go/tests/func/listsize_test/main.go
diff --git a/go/tests/tofix/func/test_listsort.go b/go/tests/func/listsort_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_listsort.go
rename to go/tests/func/listsort_test/main.go
diff --git a/go/tests/tofix/func/test_sortedlistmerge.go b/go/tests/func/sortedlistmerge_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_sortedlistmerge.go
rename to go/tests/func/sortedlistmerge_test/main.go
diff --git a/go/tests/tofix/func/test_sortlistinsert.go b/go/tests/func/sortlistinsert_test/main.go
similarity index 100%
rename from go/tests/tofix/func/test_sortlistinsert.go
rename to go/tests/func/sortlistinsert_test/main.go