diff --git a/tests/go/solutions/addprimesum/addprimesum_test.go b/tests/go/solutions/addprimesum/test_addprimesum.go
similarity index 100%
rename from tests/go/solutions/addprimesum/addprimesum_test.go
rename to tests/go/solutions/addprimesum/test_addprimesum.go
diff --git a/tests/go/solutions/alphamirror/alphamirror_test.go b/tests/go/solutions/alphamirror/test_alphamirror.go
similarity index 100%
rename from tests/go/solutions/alphamirror/alphamirror_test.go
rename to tests/go/solutions/alphamirror/test_alphamirror.go
diff --git a/tests/go/solutions/balancedstring/balancedstring_test.go b/tests/go/solutions/balancedstring/test_balancedstring.go
similarity index 100%
rename from tests/go/solutions/balancedstring/balancedstring_test.go
rename to tests/go/solutions/balancedstring/test_balancedstring.go
diff --git a/tests/go/solutions/brackets/brackets_test.go b/tests/go/solutions/brackets/test_brackets.go
similarity index 100%
rename from tests/go/solutions/brackets/brackets_test.go
rename to tests/go/solutions/brackets/test_brackets.go
diff --git a/tests/go/solutions/brainfuck/brainfuck_test.go b/tests/go/solutions/brainfuck/test_brainfuck.go
similarity index 100%
rename from tests/go/solutions/brainfuck/brainfuck_test.go
rename to tests/go/solutions/brainfuck/test_brainfuck.go
diff --git a/tests/go/solutions/capitalizeprog/capitalizeprog_test.go b/tests/go/solutions/capitalizeprog/test_capitalizeprog.go
similarity index 100%
rename from tests/go/solutions/capitalizeprog/capitalizeprog_test.go
rename to tests/go/solutions/capitalizeprog/test_capitalizeprog.go
diff --git a/tests/go/solutions/cleanstr/cleanstr_test.go b/tests/go/solutions/cleanstr/test_cleanstr.go
similarity index 100%
rename from tests/go/solutions/cleanstr/cleanstr_test.go
rename to tests/go/solutions/cleanstr/test_cleanstr.go
diff --git a/tests/go/solutions/compareprog/compareprog_test.go b/tests/go/solutions/compareprog/test_compareprog.go
similarity index 100%
rename from tests/go/solutions/compareprog/compareprog_test.go
rename to tests/go/solutions/compareprog/test_compareprog.go
diff --git a/tests/go/solutions/costumeprofit/costumeprofit_test.go b/tests/go/solutions/costumeprofit/test_costumeprofit.go
similarity index 100%
rename from tests/go/solutions/costumeprofit/costumeprofit_test.go
rename to tests/go/solutions/costumeprofit/test_costumeprofit.go
diff --git a/tests/go/fixthemain_test.go b/tests/go/solutions/countdown/test_countdown.go
similarity index 100%
rename from tests/go/fixthemain_test.go
rename to tests/go/solutions/countdown/test_countdown.go
diff --git a/tests/go/solutions/displaya/displaya_test.go b/tests/go/solutions/displaya/test_displaya.go
similarity index 100%
rename from tests/go/solutions/displaya/displaya_test.go
rename to tests/go/solutions/displaya/test_displaya.go
diff --git a/tests/go/pilot_test.go b/tests/go/solutions/displayalpham/test_displayalpham.go
similarity index 100%
rename from tests/go/pilot_test.go
rename to tests/go/solutions/displayalpham/test_displayalpham.go
diff --git a/tests/go/printalphabet_test.go b/tests/go/solutions/displayalrevm/test_displayalrevm.go
similarity index 100%
rename from tests/go/printalphabet_test.go
rename to tests/go/solutions/displayalrevm/test_displayalrevm.go
diff --git a/tests/go/solutions/displayfirstparam/displayfirstparam_test.go b/tests/go/solutions/displayfirstparam/test_displayfirstparam.go
similarity index 100%
rename from tests/go/solutions/displayfirstparam/displayfirstparam_test.go
rename to tests/go/solutions/displayfirstparam/test_displayfirstparam.go
diff --git a/tests/go/solutions/displaylastparam/displaylastparam_test.go b/tests/go/solutions/displaylastparam/test_displaylastparam.go
similarity index 100%
rename from tests/go/solutions/displaylastparam/displaylastparam_test.go
rename to tests/go/solutions/displaylastparam/test_displaylastparam.go
diff --git a/tests/go/solutions/displayz/displayz_test.go b/tests/go/solutions/displayz/test_displayz.go
similarity index 100%
rename from tests/go/solutions/displayz/displayz_test.go
rename to tests/go/solutions/displayz/test_displayz.go
diff --git a/tests/go/solutions/doopprog/doopprog_test.go b/tests/go/solutions/doopprog/test_doopprog.go
similarity index 100%
rename from tests/go/solutions/doopprog/doopprog_test.go
rename to tests/go/solutions/doopprog/test_doopprog.go
diff --git a/tests/go/solutions/expandstr/expandstr_test.go b/tests/go/solutions/expandstr/test_expandstr.go
similarity index 100%
rename from tests/go/solutions/expandstr/expandstr_test.go
rename to tests/go/solutions/expandstr/test_expandstr.go
diff --git a/tests/go/solutions/firstword/firstword_test.go b/tests/go/solutions/firstword/test_firstword.go
similarity index 100%
rename from tests/go/solutions/firstword/firstword_test.go
rename to tests/go/solutions/firstword/test_firstword.go
diff --git a/tests/go/solutions/fprime/fprime_test.go b/tests/go/solutions/fprime/test_fprime.go
similarity index 100%
rename from tests/go/solutions/fprime/fprime_test.go
rename to tests/go/solutions/fprime/test_fprime.go
diff --git a/tests/go/solutions/gcd/gcd_test.go b/tests/go/solutions/gcd/test_gcd.go
similarity index 100%
rename from tests/go/solutions/gcd/gcd_test.go
rename to tests/go/solutions/gcd/test_gcd.go
diff --git a/tests/go/solutions/grouping/grouping_test.go b/tests/go/solutions/grouping/test_grouping.go
similarity index 100%
rename from tests/go/solutions/grouping/grouping_test.go
rename to tests/go/solutions/grouping/test_grouping.go
diff --git a/tests/go/printdigits_test.go b/tests/go/solutions/hello/test_hello.go
similarity index 100%
rename from tests/go/printdigits_test.go
rename to tests/go/solutions/hello/test_hello.go
diff --git a/tests/go/solutions/hiddenp/hiddenp_test.go b/tests/go/solutions/hiddenp/test_hiddenp.go
similarity index 100%
rename from tests/go/solutions/hiddenp/hiddenp_test.go
rename to tests/go/solutions/hiddenp/test_hiddenp.go
diff --git a/tests/go/solutions/inter/inter_test.go b/tests/go/solutions/inter/test_inter.go
similarity index 100%
rename from tests/go/solutions/inter/inter_test.go
rename to tests/go/solutions/inter/test_inter.go
diff --git a/tests/go/solutions/ispowerof2/ispowerof2_test.go b/tests/go/solutions/ispowerof2/test_ispowerof2.go
similarity index 100%
rename from tests/go/solutions/ispowerof2/ispowerof2_test.go
rename to tests/go/solutions/ispowerof2/test_ispowerof2.go
diff --git a/tests/go/solutions/lastword/lastword_test.go b/tests/go/solutions/lastword/test_lastword.go
similarity index 100%
rename from tests/go/solutions/lastword/lastword_test.go
rename to tests/go/solutions/lastword/test_lastword.go
diff --git a/tests/go/solutions/nenokku/nenokku_test.go b/tests/go/solutions/nenokku/test_nenokku.go
similarity index 100%
rename from tests/go/solutions/nenokku/nenokku_test.go
rename to tests/go/solutions/nenokku/test_nenokku.go
diff --git a/tests/go/printreversealphabet_test.go b/tests/go/solutions/onlya/test_onlya.go
similarity index 100%
rename from tests/go/printreversealphabet_test.go
rename to tests/go/solutions/onlya/test_onlya.go
diff --git a/tests/go/solutions/countdown/countdown_test.go b/tests/go/solutions/onlyz/test_onlyz.go
similarity index 100%
rename from tests/go/solutions/countdown/countdown_test.go
rename to tests/go/solutions/onlyz/test_onlyz.go
diff --git a/tests/go/solutions/options/options_test.go b/tests/go/solutions/options/test_options.go
similarity index 100%
rename from tests/go/solutions/options/options_test.go
rename to tests/go/solutions/options/test_options.go
diff --git a/tests/go/paramcount_test.go b/tests/go/solutions/paramcount/test_paramcount.go
similarity index 100%
rename from tests/go/paramcount_test.go
rename to tests/go/solutions/paramcount/test_paramcount.go
diff --git a/tests/go/solutions/piglatin/piglatin_test.go b/tests/go/solutions/piglatin/test_piglatin.go
similarity index 100%
rename from tests/go/solutions/piglatin/piglatin_test.go
rename to tests/go/solutions/piglatin/test_piglatin.go
diff --git a/tests/go/solutions/displayalpham/displayalpham_test.go b/tests/go/solutions/printalphabetprog/test_printalphabetprog.go
similarity index 100%
rename from tests/go/solutions/displayalpham/displayalpham_test.go
rename to tests/go/solutions/printalphabetprog/test_printalphabetprog.go
diff --git a/tests/go/solutions/printbits/printbits_test.go b/tests/go/solutions/printbits/test_printbits.go
similarity index 100%
rename from tests/go/solutions/printbits/printbits_test.go
rename to tests/go/solutions/printbits/test_printbits.go
diff --git a/tests/go/solutions/printchessboard/printchessboard_test.go b/tests/go/solutions/printchessboard/test_printchessboard.go
similarity index 100%
rename from tests/go/solutions/printchessboard/printchessboard_test.go
rename to tests/go/solutions/printchessboard/test_printchessboard.go
diff --git a/tests/go/solutions/displayalrevm/displayalrevm_test.go b/tests/go/solutions/printcombprog/test_printcombprog.go
similarity index 100%
rename from tests/go/solutions/displayalrevm/displayalrevm_test.go
rename to tests/go/solutions/printcombprog/test_printcombprog.go
diff --git a/tests/go/solutions/hello/hello_test.go b/tests/go/solutions/printdigitsprog/test_printdigitsprog.go
similarity index 100%
rename from tests/go/solutions/hello/hello_test.go
rename to tests/go/solutions/printdigitsprog/test_printdigitsprog.go
diff --git a/tests/go/solutions/printhex/printhex_test.go b/tests/go/solutions/printhex/test_printhex.go
similarity index 100%
rename from tests/go/solutions/printhex/printhex_test.go
rename to tests/go/solutions/printhex/test_printhex.go
diff --git a/tests/go/solutions/onlya/onlya_test.go b/tests/go/solutions/printrevcombprog/test_printrevcombprog.go
similarity index 100%
rename from tests/go/solutions/onlya/onlya_test.go
rename to tests/go/solutions/printrevcombprog/test_printrevcombprog.go
diff --git a/tests/go/solutions/onlyz/onlyz_test.go b/tests/go/solutions/printreversealphabetprog/test_printreversealphabetprog.go
similarity index 100%
rename from tests/go/solutions/onlyz/onlyz_test.go
rename to tests/go/solutions/printreversealphabetprog/test_printreversealphabetprog.go
diff --git a/tests/go/solutions/printstrprog/printstrprog_test.go b/tests/go/solutions/printstrprog/test_printstrprog.go
similarity index 100%
rename from tests/go/solutions/printstrprog/printstrprog_test.go
rename to tests/go/solutions/printstrprog/test_printstrprog.go
diff --git a/tests/go/solutions/range/range_test.go b/tests/go/solutions/range/test_range.go
similarity index 100%
rename from tests/go/solutions/range/range_test.go
rename to tests/go/solutions/range/test_range.go
diff --git a/tests/go/solutions/repeatalpha/repeatalpha_test.go b/tests/go/solutions/repeatalpha/test_repeatalpha.go
similarity index 100%
rename from tests/go/solutions/repeatalpha/repeatalpha_test.go
rename to tests/go/solutions/repeatalpha/test_repeatalpha.go
diff --git a/tests/go/solutions/reverserange/reverserange_test.go b/tests/go/solutions/reverserange/test_reverserange.go
similarity index 100%
rename from tests/go/solutions/reverserange/reverserange_test.go
rename to tests/go/solutions/reverserange/test_reverserange.go
diff --git a/tests/go/solutions/reversestrcap/reversestrcap_test.go b/tests/go/solutions/reversestrcap/test_reversestrcap.go
similarity index 100%
rename from tests/go/solutions/reversestrcap/reversestrcap_test.go
rename to tests/go/solutions/reversestrcap/test_reversestrcap.go
diff --git a/tests/go/solutions/revwstr/revwstr_test.go b/tests/go/solutions/revwstr/test_revwstr.go
similarity index 100%
rename from tests/go/solutions/revwstr/revwstr_test.go
rename to tests/go/solutions/revwstr/test_revwstr.go
diff --git a/tests/go/solutions/robottoorigin/robottoorigin_test.go b/tests/go/solutions/robottoorigin/test_robottoorigin.go
similarity index 100%
rename from tests/go/solutions/robottoorigin/robottoorigin_test.go
rename to tests/go/solutions/robottoorigin/test_robottoorigin.go
diff --git a/tests/go/solutions/romannumbers/romannumbers_test.go b/tests/go/solutions/romannumbers/test_romannumbers.go
similarity index 100%
rename from tests/go/solutions/romannumbers/romannumbers_test.go
rename to tests/go/solutions/romannumbers/test_romannumbers.go
diff --git a/tests/go/solutions/rostring/rostring_test.go b/tests/go/solutions/rostring/test_rostring.go
similarity index 100%
rename from tests/go/solutions/rostring/rostring_test.go
rename to tests/go/solutions/rostring/test_rostring.go
diff --git a/tests/go/solutions/rot13/rot13_test.go b/tests/go/solutions/rot13/test_rot13.go
similarity index 100%
rename from tests/go/solutions/rot13/rot13_test.go
rename to tests/go/solutions/rot13/test_rot13.go
diff --git a/tests/go/solutions/rot14prog/rot14prog_test.go b/tests/go/solutions/rot14prog/test_rot14prog.go
similarity index 100%
rename from tests/go/solutions/rot14prog/rot14prog_test.go
rename to tests/go/solutions/rot14prog/test_rot14prog.go
diff --git a/tests/go/solutions/rpncalc/rpncalc_test.go b/tests/go/solutions/rpncalc/test_rpncalc.go
similarity index 100%
rename from tests/go/solutions/rpncalc/rpncalc_test.go
rename to tests/go/solutions/rpncalc/test_rpncalc.go
diff --git a/tests/go/solutions/searchreplace/searchreplace_test.go b/tests/go/solutions/searchreplace/test_searchreplace.go
similarity index 100%
rename from tests/go/solutions/searchreplace/searchreplace_test.go
rename to tests/go/solutions/searchreplace/test_searchreplace.go
diff --git a/tests/go/solutions/strrevprog/strrevprog_test.go b/tests/go/solutions/strrevprog/test_strrevprog.go
similarity index 100%
rename from tests/go/solutions/strrevprog/strrevprog_test.go
rename to tests/go/solutions/strrevprog/test_strrevprog.go
diff --git a/tests/go/solutions/switchcase/switchcase_test.go b/tests/go/solutions/switchcase/test_switchcase.go
similarity index 100%
rename from tests/go/solutions/switchcase/switchcase_test.go
rename to tests/go/solutions/switchcase/test_switchcase.go
diff --git a/tests/go/solutions/tabmult/tabmult_test.go b/tests/go/solutions/tabmult/test_tabmult.go
similarity index 100%
rename from tests/go/solutions/tabmult/tabmult_test.go
rename to tests/go/solutions/tabmult/test_tabmult.go
diff --git a/tests/go/solutions/union/union_test.go b/tests/go/solutions/union/test_union.go
similarity index 100%
rename from tests/go/solutions/union/union_test.go
rename to tests/go/solutions/union/test_union.go
diff --git a/tests/go/solutions/uniqueoccurences/uniqueoccurences_test.go b/tests/go/solutions/uniqueoccurences/test_uniqueoccurences.go
similarity index 100%
rename from tests/go/solutions/uniqueoccurences/uniqueoccurences_test.go
rename to tests/go/solutions/uniqueoccurences/test_uniqueoccurences.go
diff --git a/tests/go/solutions/wdmatch/wdmatch_test.go b/tests/go/solutions/wdmatch/test_wdmatch.go
similarity index 100%
rename from tests/go/solutions/wdmatch/wdmatch_test.go
rename to tests/go/solutions/wdmatch/test_wdmatch.go
diff --git a/tests/go/atoibaseprog_test.go b/tests/go/test_atoibaseprog.go
similarity index 100%
rename from tests/go/atoibaseprog_test.go
rename to tests/go/test_atoibaseprog.go
diff --git a/tests/go/boolean_test.go b/tests/go/test_boolean.go
similarity index 100%
rename from tests/go/boolean_test.go
rename to tests/go/test_boolean.go
diff --git a/tests/go/cat_test.go b/tests/go/test_cat.go
similarity index 100%
rename from tests/go/cat_test.go
rename to tests/go/test_cat.go
diff --git a/tests/go/comcheck_test.go b/tests/go/test_comcheck.go
similarity index 100%
rename from tests/go/comcheck_test.go
rename to tests/go/test_comcheck.go
diff --git a/tests/go/displayfile_test.go b/tests/go/test_displayfile.go
similarity index 100%
rename from tests/go/displayfile_test.go
rename to tests/go/test_displayfile.go
diff --git a/tests/go/doop_test.go b/tests/go/test_doop.go
similarity index 100%
rename from tests/go/doop_test.go
rename to tests/go/test_doop.go
diff --git a/tests/go/solutions/printalphabetprog/printalphabetprog_test.go b/tests/go/test_fixthemain.go
similarity index 100%
rename from tests/go/solutions/printalphabetprog/printalphabetprog_test.go
rename to tests/go/test_fixthemain.go
diff --git a/tests/go/flags_test.go b/tests/go/test_flags.go
similarity index 100%
rename from tests/go/flags_test.go
rename to tests/go/test_flags.go
diff --git a/tests/go/nbrconvertalpha_test.go b/tests/go/test_nbrconvertalpha.go
similarity index 100%
rename from tests/go/nbrconvertalpha_test.go
rename to tests/go/test_nbrconvertalpha.go
diff --git a/tests/go/solutions/paramcount/paramcount_test.go b/tests/go/test_paramcount.go
similarity index 100%
rename from tests/go/solutions/paramcount/paramcount_test.go
rename to tests/go/test_paramcount.go
diff --git a/tests/go/solutions/printcombprog/printcombprog_test.go b/tests/go/test_pilot.go
similarity index 100%
rename from tests/go/solutions/printcombprog/printcombprog_test.go
rename to tests/go/test_pilot.go
diff --git a/tests/go/point_test.go b/tests/go/test_point.go
similarity index 100%
rename from tests/go/point_test.go
rename to tests/go/test_point.go
diff --git a/tests/go/solutions/printdigitsprog/printdigitsprog_test.go b/tests/go/test_printalphabet.go
similarity index 100%
rename from tests/go/solutions/printdigitsprog/printdigitsprog_test.go
rename to tests/go/test_printalphabet.go
diff --git a/tests/go/solutions/printrevcombprog/printrevcombprog_test.go b/tests/go/test_printdigits.go
similarity index 100%
rename from tests/go/solutions/printrevcombprog/printrevcombprog_test.go
rename to tests/go/test_printdigits.go
diff --git a/tests/go/printparams_test.go b/tests/go/test_printparams.go
similarity index 100%
rename from tests/go/printparams_test.go
rename to tests/go/test_printparams.go
diff --git a/tests/go/solutions/printreversealphabetprog/printreversealphabetprog_test.go b/tests/go/test_printreversealphabet.go
similarity index 100%
rename from tests/go/solutions/printreversealphabetprog/printreversealphabetprog_test.go
rename to tests/go/test_printreversealphabet.go
diff --git a/tests/go/raid2_test.go b/tests/go/test_raid2.go
similarity index 100%
rename from tests/go/raid2_test.go
rename to tests/go/test_raid2.go
diff --git a/tests/go/rectangle_test.go b/tests/go/test_rectangle.go
similarity index 100%
rename from tests/go/rectangle_test.go
rename to tests/go/test_rectangle.go
diff --git a/tests/go/revparams_test.go b/tests/go/test_revparams.go
similarity index 100%
rename from tests/go/revparams_test.go
rename to tests/go/test_revparams.go
diff --git a/tests/go/rotatevowels_test.go b/tests/go/test_rotatevowels.go
similarity index 100%
rename from tests/go/rotatevowels_test.go
rename to tests/go/test_rotatevowels.go
diff --git a/tests/go/sortparams_test.go b/tests/go/test_sortparams.go
similarity index 100%
rename from tests/go/sortparams_test.go
rename to tests/go/test_sortparams.go