diff --git a/tests/go/prog/test_addprimesum.go b/tests/go/prog/addprimesum/test.go
similarity index 100%
rename from tests/go/prog/test_addprimesum.go
rename to tests/go/prog/addprimesum/test.go
diff --git a/tests/go/prog/test_alphamirror.go b/tests/go/prog/alphamirror/test.go
similarity index 100%
rename from tests/go/prog/test_alphamirror.go
rename to tests/go/prog/alphamirror/test.go
diff --git a/tests/go/prog/test_balancedstring.go b/tests/go/prog/balancedstring/test.go
similarity index 100%
rename from tests/go/prog/test_balancedstring.go
rename to tests/go/prog/balancedstring/test.go
diff --git a/tests/go/prog/test_boolean.go b/tests/go/prog/boolean/test.go
similarity index 100%
rename from tests/go/prog/test_boolean.go
rename to tests/go/prog/boolean/test.go
diff --git a/tests/go/prog/test_brackets.go b/tests/go/prog/brackets/test.go
similarity index 100%
rename from tests/go/prog/test_brackets.go
rename to tests/go/prog/brackets/test.go
diff --git a/tests/go/prog/test_brainfuck.go b/tests/go/prog/brainfuck/test.go
similarity index 100%
rename from tests/go/prog/test_brainfuck.go
rename to tests/go/prog/brainfuck/test.go
diff --git a/tests/go/prog/test_cat.go b/tests/go/prog/cat/test.go
similarity index 100%
rename from tests/go/prog/test_cat.go
rename to tests/go/prog/cat/test.go
diff --git a/tests/go/prog/test_cleanstr.go b/tests/go/prog/cleanstr/test.go
similarity index 100%
rename from tests/go/prog/test_cleanstr.go
rename to tests/go/prog/cleanstr/test.go
diff --git a/tests/go/prog/test_comcheck.go b/tests/go/prog/comcheck/test.go
similarity index 100%
rename from tests/go/prog/test_comcheck.go
rename to tests/go/prog/comcheck/test.go
diff --git a/tests/go/prog/test_costumeprofit.go b/tests/go/prog/costumeprofit/test.go
similarity index 100%
rename from tests/go/prog/test_costumeprofit.go
rename to tests/go/prog/costumeprofit/test.go
diff --git a/tests/go/prog/test_countdown.go b/tests/go/prog/countdown/test.go
similarity index 100%
rename from tests/go/prog/test_countdown.go
rename to tests/go/prog/countdown/test.go
diff --git a/tests/go/prog/test_displaya.go b/tests/go/prog/displaya/test.go
similarity index 100%
rename from tests/go/prog/test_displaya.go
rename to tests/go/prog/displaya/test.go
diff --git a/tests/go/prog/test_displayalpham.go b/tests/go/prog/displayalpham/test.go
similarity index 100%
rename from tests/go/prog/test_displayalpham.go
rename to tests/go/prog/displayalpham/test.go
diff --git a/tests/go/prog/test_displayalrevm.go b/tests/go/prog/displayalrevm/test.go
similarity index 100%
rename from tests/go/prog/test_displayalrevm.go
rename to tests/go/prog/displayalrevm/test.go
diff --git a/tests/go/prog/test_displayfile.go b/tests/go/prog/displayfile/test.go
similarity index 100%
rename from tests/go/prog/test_displayfile.go
rename to tests/go/prog/displayfile/test.go
diff --git a/tests/go/prog/test_displayfirstparam.go b/tests/go/prog/displayfirstparam/test.go
similarity index 100%
rename from tests/go/prog/test_displayfirstparam.go
rename to tests/go/prog/displayfirstparam/test.go
diff --git a/tests/go/prog/test_displaylastparam.go b/tests/go/prog/displaylastparam/test.go
similarity index 100%
rename from tests/go/prog/test_displaylastparam.go
rename to tests/go/prog/displaylastparam/test.go
diff --git a/tests/go/prog/test_displayz.go b/tests/go/prog/displayz/test.go
similarity index 100%
rename from tests/go/prog/test_displayz.go
rename to tests/go/prog/displayz/test.go
diff --git a/tests/go/prog/test_doop.go b/tests/go/prog/doop/test.go
similarity index 100%
rename from tests/go/prog/test_doop.go
rename to tests/go/prog/doop/test.go
diff --git a/tests/go/prog/test_expandstr.go b/tests/go/prog/expandstr/test.go
similarity index 100%
rename from tests/go/prog/test_expandstr.go
rename to tests/go/prog/expandstr/test.go
diff --git a/tests/go/prog/test_firstword.go b/tests/go/prog/firstword/test.go
similarity index 100%
rename from tests/go/prog/test_firstword.go
rename to tests/go/prog/firstword/test.go
diff --git a/tests/go/prog/test_fixthemain.go b/tests/go/prog/fixthemain/test.go
similarity index 100%
rename from tests/go/prog/test_fixthemain.go
rename to tests/go/prog/fixthemain/test.go
diff --git a/tests/go/prog/test_flags.go b/tests/go/prog/flags/test.go
similarity index 100%
rename from tests/go/prog/test_flags.go
rename to tests/go/prog/flags/test.go
diff --git a/tests/go/prog/test_fprime.go b/tests/go/prog/fprime/test.go
similarity index 100%
rename from tests/go/prog/test_fprime.go
rename to tests/go/prog/fprime/test.go
diff --git a/tests/go/prog/test_gcd.go b/tests/go/prog/gcd/test.go
similarity index 100%
rename from tests/go/prog/test_gcd.go
rename to tests/go/prog/gcd/test.go
diff --git a/tests/go/prog/test_grouping.go b/tests/go/prog/grouping/test.go
similarity index 100%
rename from tests/go/prog/test_grouping.go
rename to tests/go/prog/grouping/test.go
diff --git a/tests/go/prog/test_hello.go b/tests/go/prog/hello/test.go
similarity index 100%
rename from tests/go/prog/test_hello.go
rename to tests/go/prog/hello/test.go
diff --git a/tests/go/prog/test_hiddenp.go b/tests/go/prog/hiddenp/test.go
similarity index 100%
rename from tests/go/prog/test_hiddenp.go
rename to tests/go/prog/hiddenp/test.go
diff --git a/tests/go/prog/test_inter.go b/tests/go/prog/inter/test.go
similarity index 100%
rename from tests/go/prog/test_inter.go
rename to tests/go/prog/inter/test.go
diff --git a/tests/go/prog/test_ispowerof2.go b/tests/go/prog/ispowerof2/test.go
similarity index 100%
rename from tests/go/prog/test_ispowerof2.go
rename to tests/go/prog/ispowerof2/test.go
diff --git a/tests/go/prog/test_lastword.go b/tests/go/prog/lastword/test.go
similarity index 100%
rename from tests/go/prog/test_lastword.go
rename to tests/go/prog/lastword/test.go
diff --git a/tests/go/prog/test_nbrconvertalpha.go b/tests/go/prog/nbrconvertalpha/test.go
similarity index 100%
rename from tests/go/prog/test_nbrconvertalpha.go
rename to tests/go/prog/nbrconvertalpha/test.go
diff --git a/tests/go/prog/test_nenokku.go b/tests/go/prog/nenokku/test.go
similarity index 100%
rename from tests/go/prog/test_nenokku.go
rename to tests/go/prog/nenokku/test.go
diff --git a/tests/go/prog/test_onlya.go b/tests/go/prog/onlya/test.go
similarity index 100%
rename from tests/go/prog/test_onlya.go
rename to tests/go/prog/onlya/test.go
diff --git a/tests/go/prog/test_onlyz.go b/tests/go/prog/onlyz/test.go
similarity index 100%
rename from tests/go/prog/test_onlyz.go
rename to tests/go/prog/onlyz/test.go
diff --git a/tests/go/prog/test_options.go b/tests/go/prog/options/test.go
similarity index 100%
rename from tests/go/prog/test_options.go
rename to tests/go/prog/options/test.go
diff --git a/tests/go/prog/test_paramcount.go b/tests/go/prog/paramcount/test.go
similarity index 100%
rename from tests/go/prog/test_paramcount.go
rename to tests/go/prog/paramcount/test.go
diff --git a/tests/go/prog/test_piglatin.go b/tests/go/prog/piglatin/test.go
similarity index 100%
rename from tests/go/prog/test_piglatin.go
rename to tests/go/prog/piglatin/test.go
diff --git a/tests/go/prog/test_pilot.go b/tests/go/prog/pilot/test.go
similarity index 100%
rename from tests/go/prog/test_pilot.go
rename to tests/go/prog/pilot/test.go
diff --git a/tests/go/prog/test_point.go b/tests/go/prog/point/test.go
similarity index 100%
rename from tests/go/prog/test_point.go
rename to tests/go/prog/point/test.go
diff --git a/tests/go/prog/test_printalphabet.go b/tests/go/prog/printalphabet/test.go
similarity index 100%
rename from tests/go/prog/test_printalphabet.go
rename to tests/go/prog/printalphabet/test.go
diff --git a/tests/go/prog/test_printbits.go b/tests/go/prog/printbits/test.go
similarity index 100%
rename from tests/go/prog/test_printbits.go
rename to tests/go/prog/printbits/test.go
diff --git a/tests/go/prog/test_printchessboard.go b/tests/go/prog/printchessboard/test.go
similarity index 100%
rename from tests/go/prog/test_printchessboard.go
rename to tests/go/prog/printchessboard/test.go
diff --git a/tests/go/prog/test_printdigits.go b/tests/go/prog/printdigits/test.go
similarity index 100%
rename from tests/go/prog/test_printdigits.go
rename to tests/go/prog/printdigits/test.go
diff --git a/tests/go/prog/test_printhex.go b/tests/go/prog/printhex/test.go
similarity index 100%
rename from tests/go/prog/test_printhex.go
rename to tests/go/prog/printhex/test.go
diff --git a/tests/go/prog/test_printparams.go b/tests/go/prog/printparams/test.go
similarity index 100%
rename from tests/go/prog/test_printparams.go
rename to tests/go/prog/printparams/test.go
diff --git a/tests/go/prog/test_printprogramname.go b/tests/go/prog/printprogramname/test.go
similarity index 100%
rename from tests/go/prog/test_printprogramname.go
rename to tests/go/prog/printprogramname/test.go
diff --git a/tests/go/prog/test_printrevcomb.go b/tests/go/prog/printrevcomb/test.go
similarity index 100%
rename from tests/go/prog/test_printrevcomb.go
rename to tests/go/prog/printrevcomb/test.go
diff --git a/tests/go/prog/test_printreversealphabet.go b/tests/go/prog/printreversealphabet/test.go
similarity index 100%
rename from tests/go/prog/test_printreversealphabet.go
rename to tests/go/prog/printreversealphabet/test.go
diff --git a/tests/go/prog/test_raid2.go b/tests/go/prog/raid2/test.go
similarity index 100%
rename from tests/go/prog/test_raid2.go
rename to tests/go/prog/raid2/test.go
diff --git a/tests/go/prog/test_raid3.go b/tests/go/prog/raid3/test.go
similarity index 100%
rename from tests/go/prog/test_raid3.go
rename to tests/go/prog/raid3/test.go
diff --git a/tests/go/prog/test_range.go b/tests/go/prog/range/test.go
similarity index 100%
rename from tests/go/prog/test_range.go
rename to tests/go/prog/range/test.go
diff --git a/tests/go/prog/test_rectangle.go b/tests/go/prog/rectangle/test.go
similarity index 100%
rename from tests/go/prog/test_rectangle.go
rename to tests/go/prog/rectangle/test.go
diff --git a/tests/go/prog/test_repeatalpha.go b/tests/go/prog/repeatalpha/test.go
similarity index 100%
rename from tests/go/prog/test_repeatalpha.go
rename to tests/go/prog/repeatalpha/test.go
diff --git a/tests/go/prog/test_reverserange.go b/tests/go/prog/reverserange/test.go
similarity index 100%
rename from tests/go/prog/test_reverserange.go
rename to tests/go/prog/reverserange/test.go
diff --git a/tests/go/prog/test_reversestrcap.go b/tests/go/prog/reversestrcap/test.go
similarity index 100%
rename from tests/go/prog/test_reversestrcap.go
rename to tests/go/prog/reversestrcap/test.go
diff --git a/tests/go/prog/test_revparams.go b/tests/go/prog/revparams/test.go
similarity index 100%
rename from tests/go/prog/test_revparams.go
rename to tests/go/prog/revparams/test.go
diff --git a/tests/go/prog/test_revwstr.go b/tests/go/prog/revwstr/test.go
similarity index 100%
rename from tests/go/prog/test_revwstr.go
rename to tests/go/prog/revwstr/test.go
diff --git a/tests/go/prog/test_robottoorigin.go b/tests/go/prog/robottoorigin/test.go
similarity index 100%
rename from tests/go/prog/test_robottoorigin.go
rename to tests/go/prog/robottoorigin/test.go
diff --git a/tests/go/prog/test_romannumbers.go b/tests/go/prog/romannumbers/test.go
similarity index 100%
rename from tests/go/prog/test_romannumbers.go
rename to tests/go/prog/romannumbers/test.go
diff --git a/tests/go/prog/test_rostring.go b/tests/go/prog/rostring/test.go
similarity index 100%
rename from tests/go/prog/test_rostring.go
rename to tests/go/prog/rostring/test.go
diff --git a/tests/go/prog/test_rot13.go b/tests/go/prog/rot13/test.go
similarity index 100%
rename from tests/go/prog/test_rot13.go
rename to tests/go/prog/rot13/test.go
diff --git a/tests/go/prog/test_rotatevowels.go b/tests/go/prog/rotatevowels/test.go
similarity index 100%
rename from tests/go/prog/test_rotatevowels.go
rename to tests/go/prog/rotatevowels/test.go
diff --git a/tests/go/prog/test_rpncalc.go b/tests/go/prog/rpncalc/test.go
similarity index 100%
rename from tests/go/prog/test_rpncalc.go
rename to tests/go/prog/rpncalc/test.go
diff --git a/tests/go/prog/test_searchreplace.go b/tests/go/prog/searchreplace/test.go
similarity index 100%
rename from tests/go/prog/test_searchreplace.go
rename to tests/go/prog/searchreplace/test.go
diff --git a/tests/go/prog/test_sortparams.go b/tests/go/prog/sortparams/test.go
similarity index 100%
rename from tests/go/prog/test_sortparams.go
rename to tests/go/prog/sortparams/test.go
diff --git a/tests/go/prog/test_switchcase.go b/tests/go/prog/switchcase/test.go
similarity index 100%
rename from tests/go/prog/test_switchcase.go
rename to tests/go/prog/switchcase/test.go
diff --git a/tests/go/prog/test_tabmult.go b/tests/go/prog/tabmult/test.go
similarity index 100%
rename from tests/go/prog/test_tabmult.go
rename to tests/go/prog/tabmult/test.go
diff --git a/tests/go/prog/test_tetrisoptimizer.go b/tests/go/prog/tetrisoptimizer/test.go
similarity index 100%
rename from tests/go/prog/test_tetrisoptimizer.go
rename to tests/go/prog/tetrisoptimizer/test.go
diff --git a/tests/go/prog/test_union.go b/tests/go/prog/union/test.go
similarity index 100%
rename from tests/go/prog/test_union.go
rename to tests/go/prog/union/test.go
diff --git a/tests/go/prog/test_uniqueoccurences.go b/tests/go/prog/uniqueoccurences/test.go
similarity index 100%
rename from tests/go/prog/test_uniqueoccurences.go
rename to tests/go/prog/uniqueoccurences/test.go
diff --git a/tests/go/prog/test_wdmatch.go b/tests/go/prog/wdmatch/test.go
similarity index 100%
rename from tests/go/prog/test_wdmatch.go
rename to tests/go/prog/wdmatch/test.go
diff --git a/tests/go/prog/test_ztail.go b/tests/go/prog/ztail/test.go
similarity index 100%
rename from tests/go/prog/test_ztail.go
rename to tests/go/prog/ztail/test.go