diff --git a/go/tests/addprimesum/correct/main.go b/go/tests/addprimesum/addprimesum_correct/main.go similarity index 100% rename from go/tests/addprimesum/correct/main.go rename to go/tests/addprimesum/addprimesum_correct/main.go diff --git a/go/tests/alphamirror/correct/main.go b/go/tests/alphamirror/alphamirror_correct/main.go similarity index 100% rename from go/tests/alphamirror/correct/main.go rename to go/tests/alphamirror/alphamirror_correct/main.go diff --git a/go/tests/balancedstring/correct/main.go b/go/tests/balancedstring/balancedstring_correct/main.go similarity index 100% rename from go/tests/balancedstring/correct/main.go rename to go/tests/balancedstring/balancedstring_correct/main.go diff --git a/go/tests/boolean/correct/main.go b/go/tests/boolean/boolean_correct/main.go similarity index 100% rename from go/tests/boolean/correct/main.go rename to go/tests/boolean/boolean_correct/main.go diff --git a/go/tests/brackets/correct/main.go b/go/tests/brackets/brackets_correct/main.go similarity index 100% rename from go/tests/brackets/correct/main.go rename to go/tests/brackets/brackets_correct/main.go diff --git a/go/tests/brainfuck/correct/main.go b/go/tests/brainfuck/brainfuck_correct/main.go similarity index 100% rename from go/tests/brainfuck/correct/main.go rename to go/tests/brainfuck/brainfuck_correct/main.go diff --git a/go/tests/cleanstr/correct/main.go b/go/tests/cleanstr/cleanstr_correct/main.go similarity index 100% rename from go/tests/cleanstr/correct/main.go rename to go/tests/cleanstr/cleanstr_correct/main.go diff --git a/go/tests/comcheck/correct/main.go b/go/tests/comcheck/comcheck_correct/main.go similarity index 100% rename from go/tests/comcheck/correct/main.go rename to go/tests/comcheck/comcheck_correct/main.go diff --git a/go/tests/costumeprofit/correct/main.go b/go/tests/costumeprofit/costumeprofit_correct/main.go similarity index 100% rename from go/tests/costumeprofit/correct/main.go rename to go/tests/costumeprofit/costumeprofit_correct/main.go diff --git a/go/tests/countdown/correct/main.go b/go/tests/countdown/countdown_correct/main.go similarity index 100% rename from go/tests/countdown/correct/main.go rename to go/tests/countdown/countdown_correct/main.go diff --git a/go/tests/displaya/correct/main.go b/go/tests/displaya/displaya_correct/main.go similarity index 100% rename from go/tests/displaya/correct/main.go rename to go/tests/displaya/displaya_correct/main.go diff --git a/go/tests/displayalpham/correct/main.go b/go/tests/displayalpham/displayalpham_correct/main.go similarity index 100% rename from go/tests/displayalpham/correct/main.go rename to go/tests/displayalpham/displayalpham_correct/main.go diff --git a/go/tests/displayalrevm/correct/main.go b/go/tests/displayalrevm/displayalrevm_correct/main.go similarity index 100% rename from go/tests/displayalrevm/correct/main.go rename to go/tests/displayalrevm/displayalrevm_correct/main.go diff --git a/go/tests/displayfirstparam/correct/main.go b/go/tests/displayfirstparam/displayfirstparam_correct/main.go similarity index 100% rename from go/tests/displayfirstparam/correct/main.go rename to go/tests/displayfirstparam/displayfirstparam_correct/main.go diff --git a/go/tests/displaylastparam/correct/main.go b/go/tests/displaylastparam/displaylastparam_correct/main.go similarity index 100% rename from go/tests/displaylastparam/correct/main.go rename to go/tests/displaylastparam/displaylastparam_correct/main.go diff --git a/go/tests/displayz/correct/main.go b/go/tests/displayz/displayz_correct/main.go similarity index 100% rename from go/tests/displayz/correct/main.go rename to go/tests/displayz/displayz_correct/main.go diff --git a/go/tests/doop/correct/main.go b/go/tests/doop/doop_correct/main.go similarity index 100% rename from go/tests/doop/correct/main.go rename to go/tests/doop/doop_correct/main.go diff --git a/go/tests/expandstr/correct/main.go b/go/tests/expandstr/expandstr_correct/main.go similarity index 100% rename from go/tests/expandstr/correct/main.go rename to go/tests/expandstr/expandstr_correct/main.go diff --git a/go/tests/firstword/correct/main.go b/go/tests/firstword/firstword_correct/main.go similarity index 100% rename from go/tests/firstword/correct/main.go rename to go/tests/firstword/firstword_correct/main.go diff --git a/go/tests/fixthemain/correct/main.go b/go/tests/fixthemain/fixthemain_correct/main.go similarity index 100% rename from go/tests/fixthemain/correct/main.go rename to go/tests/fixthemain/fixthemain_correct/main.go diff --git a/go/tests/flags/correct/main.go b/go/tests/flags/flags_correct/main.go similarity index 100% rename from go/tests/flags/correct/main.go rename to go/tests/flags/flags_correct/main.go diff --git a/go/tests/fprime/correct/main.go b/go/tests/fprime/fprime_correct/main.go similarity index 100% rename from go/tests/fprime/correct/main.go rename to go/tests/fprime/fprime_correct/main.go diff --git a/go/tests/gcd/correct/main.go b/go/tests/gcd/gcd_correct/main.go similarity index 100% rename from go/tests/gcd/correct/main.go rename to go/tests/gcd/gcd_correct/main.go diff --git a/go/tests/grouping/correct/main.go b/go/tests/grouping/grouping_correct/main.go similarity index 100% rename from go/tests/grouping/correct/main.go rename to go/tests/grouping/grouping_correct/main.go diff --git a/go/tests/hello/correct/main.go b/go/tests/hello/hello_correct/main.go similarity index 100% rename from go/tests/hello/correct/main.go rename to go/tests/hello/hello_correct/main.go diff --git a/go/tests/hiddenp/correct/main.go b/go/tests/hiddenp/hiddenp_correct/main.go similarity index 100% rename from go/tests/hiddenp/correct/main.go rename to go/tests/hiddenp/hiddenp_correct/main.go diff --git a/go/tests/inter/correct/main.go b/go/tests/inter/inter_correct/main.go similarity index 100% rename from go/tests/inter/correct/main.go rename to go/tests/inter/inter_correct/main.go diff --git a/go/tests/ispowerof2/correct/main.go b/go/tests/ispowerof2/ispowerof2_correct/main.go similarity index 100% rename from go/tests/ispowerof2/correct/main.go rename to go/tests/ispowerof2/ispowerof2_correct/main.go diff --git a/go/tests/lastword/correct/main.go b/go/tests/lastword/lastword_correct/main.go similarity index 100% rename from go/tests/lastword/correct/main.go rename to go/tests/lastword/lastword_correct/main.go diff --git a/go/tests/nbrconvertalpha/correct/main.go b/go/tests/nbrconvertalpha/nbrconvertalpha_correct/main.go similarity index 100% rename from go/tests/nbrconvertalpha/correct/main.go rename to go/tests/nbrconvertalpha/nbrconvertalpha_correct/main.go diff --git a/go/tests/nenokku/correct/main.go b/go/tests/nenokku/nenokku_correct/main.go similarity index 100% rename from go/tests/nenokku/correct/main.go rename to go/tests/nenokku/nenokku_correct/main.go diff --git a/go/tests/onlya/correct/main.go b/go/tests/onlya/onlya_correct/main.go similarity index 100% rename from go/tests/onlya/correct/main.go rename to go/tests/onlya/onlya_correct/main.go diff --git a/go/tests/onlyz/correct/main.go b/go/tests/onlyz/onlyz_correct/main.go similarity index 100% rename from go/tests/onlyz/correct/main.go rename to go/tests/onlyz/onlyz_correct/main.go diff --git a/go/tests/options/correct/main.go b/go/tests/options/options_correct/main.go similarity index 100% rename from go/tests/options/correct/main.go rename to go/tests/options/options_correct/main.go diff --git a/go/tests/paramcount/correct/main.go b/go/tests/paramcount/paramcount_correct/main.go similarity index 100% rename from go/tests/paramcount/correct/main.go rename to go/tests/paramcount/paramcount_correct/main.go diff --git a/go/tests/piglatin/correct/main.go b/go/tests/piglatin/piglatin_correct/main.go similarity index 100% rename from go/tests/piglatin/correct/main.go rename to go/tests/piglatin/piglatin_correct/main.go diff --git a/go/tests/point/correct/main.go b/go/tests/point/point_correct/main.go similarity index 100% rename from go/tests/point/correct/main.go rename to go/tests/point/point_correct/main.go diff --git a/go/tests/printalphabet/correct/main.go b/go/tests/printalphabet/printalphabet_correct/main.go similarity index 100% rename from go/tests/printalphabet/correct/main.go rename to go/tests/printalphabet/printalphabet_correct/main.go diff --git a/go/tests/printbits/correct/main.go b/go/tests/printbits/printbits_correct/main.go similarity index 100% rename from go/tests/printbits/correct/main.go rename to go/tests/printbits/printbits_correct/main.go diff --git a/go/tests/printchessboard/correct/main.go b/go/tests/printchessboard/printchessboard_correct/main.go similarity index 100% rename from go/tests/printchessboard/correct/main.go rename to go/tests/printchessboard/printchessboard_correct/main.go diff --git a/go/tests/printdigits/correct/main.go b/go/tests/printdigits/printdigits_correct/main.go similarity index 100% rename from go/tests/printdigits/correct/main.go rename to go/tests/printdigits/printdigits_correct/main.go diff --git a/go/tests/printhex/correct/main.go b/go/tests/printhex/printhex_correct/main.go similarity index 100% rename from go/tests/printhex/correct/main.go rename to go/tests/printhex/printhex_correct/main.go diff --git a/go/tests/printparams/correct/main.go b/go/tests/printparams/printparams_correct/main.go similarity index 100% rename from go/tests/printparams/correct/main.go rename to go/tests/printparams/printparams_correct/main.go diff --git a/go/tests/printprogramname/correct/main.go b/go/tests/printprogramname/printprogramname_correct/main.go similarity index 100% rename from go/tests/printprogramname/correct/main.go rename to go/tests/printprogramname/printprogramname_correct/main.go diff --git a/go/tests/printrevcomb/correct/main.go b/go/tests/printrevcomb/printrevcomb_correct/main.go similarity index 100% rename from go/tests/printrevcomb/correct/main.go rename to go/tests/printrevcomb/printrevcomb_correct/main.go diff --git a/go/tests/printreversealphabet/correct/main.go b/go/tests/printreversealphabet/printreversealphabet_correct/main.go similarity index 100% rename from go/tests/printreversealphabet/correct/main.go rename to go/tests/printreversealphabet/printreversealphabet_correct/main.go diff --git a/go/tests/raid2/correct/main.go b/go/tests/raid2/raid2_correct/main.go similarity index 100% rename from go/tests/raid2/correct/main.go rename to go/tests/raid2/raid2_correct/main.go diff --git a/go/tests/range/correct/main.go b/go/tests/range/range_correct/main.go similarity index 100% rename from go/tests/range/correct/main.go rename to go/tests/range/range_correct/main.go diff --git a/go/tests/rectangle/correct/main.go b/go/tests/rectangle/rectangle_correct/main.go similarity index 100% rename from go/tests/rectangle/correct/main.go rename to go/tests/rectangle/rectangle_correct/main.go diff --git a/go/tests/repeatalpha/correct/main.go b/go/tests/repeatalpha/repeatalpha_correct/main.go similarity index 100% rename from go/tests/repeatalpha/correct/main.go rename to go/tests/repeatalpha/repeatalpha_correct/main.go diff --git a/go/tests/reverserange/correct/main.go b/go/tests/reverserange/reverserange_correct/main.go similarity index 100% rename from go/tests/reverserange/correct/main.go rename to go/tests/reverserange/reverserange_correct/main.go diff --git a/go/tests/reversestrcap/correct/main.go b/go/tests/reversestrcap/reversestrcap_correct/main.go similarity index 100% rename from go/tests/reversestrcap/correct/main.go rename to go/tests/reversestrcap/reversestrcap_correct/main.go diff --git a/go/tests/revparams/correct/main.go b/go/tests/revparams/revparams_correct/main.go similarity index 100% rename from go/tests/revparams/correct/main.go rename to go/tests/revparams/revparams_correct/main.go diff --git a/go/tests/revwstr/correct/main.go b/go/tests/revwstr/revwstr_correct/main.go similarity index 100% rename from go/tests/revwstr/correct/main.go rename to go/tests/revwstr/revwstr_correct/main.go diff --git a/go/tests/robottoorigin/correct/main.go b/go/tests/robottoorigin/robottoorigin_correct/main.go similarity index 100% rename from go/tests/robottoorigin/correct/main.go rename to go/tests/robottoorigin/robottoorigin_correct/main.go diff --git a/go/tests/romannumbers/correct/main.go b/go/tests/romannumbers/romannumbers_correct/main.go similarity index 100% rename from go/tests/romannumbers/correct/main.go rename to go/tests/romannumbers/romannumbers_correct/main.go diff --git a/go/tests/rostring/correct/main.go b/go/tests/rostring/rostring_correct/main.go similarity index 100% rename from go/tests/rostring/correct/main.go rename to go/tests/rostring/rostring_correct/main.go diff --git a/go/tests/rot13/correct/main.go b/go/tests/rot13/rot13_correct/main.go similarity index 100% rename from go/tests/rot13/correct/main.go rename to go/tests/rot13/rot13_correct/main.go diff --git a/go/tests/rotatevowels/correct/main.go b/go/tests/rotatevowels/rotatevowels_correct/main.go similarity index 100% rename from go/tests/rotatevowels/correct/main.go rename to go/tests/rotatevowels/rotatevowels_correct/main.go diff --git a/go/tests/rpncalc/correct/main.go b/go/tests/rpncalc/rpncalc_correct/main.go similarity index 100% rename from go/tests/rpncalc/correct/main.go rename to go/tests/rpncalc/rpncalc_correct/main.go diff --git a/go/tests/searchreplace/correct/main.go b/go/tests/searchreplace/searchreplace_correct/main.go similarity index 100% rename from go/tests/searchreplace/correct/main.go rename to go/tests/searchreplace/searchreplace_correct/main.go diff --git a/go/tests/sortparams/correct/main.go b/go/tests/sortparams/sortparams_correct/main.go similarity index 100% rename from go/tests/sortparams/correct/main.go rename to go/tests/sortparams/sortparams_correct/main.go diff --git a/go/tests/switchcase/correct/main.go b/go/tests/switchcase/switchcase_correct/main.go similarity index 100% rename from go/tests/switchcase/correct/main.go rename to go/tests/switchcase/switchcase_correct/main.go diff --git a/go/tests/tabmult/correct/main.go b/go/tests/tabmult/tabmult_correct/main.go similarity index 100% rename from go/tests/tabmult/correct/main.go rename to go/tests/tabmult/tabmult_correct/main.go diff --git a/go/tests/tetrisoptimizer/correct/board.go b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/board.go similarity index 100% rename from go/tests/tetrisoptimizer/correct/board.go rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/board.go diff --git a/go/tests/tetrisoptimizer/correct/main.go b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/main.go similarity index 100% rename from go/tests/tetrisoptimizer/correct/main.go rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/main.go diff --git a/go/tests/tetrisoptimizer/correct/samples/bad00.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad00.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/bad00.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad00.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/bad01.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad01.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/bad01.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad01.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/bad02.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad02.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/bad02.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad02.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/bad03.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad03.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/bad03.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad03.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/bad04.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad04.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/bad04.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad04.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/badFormat.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/badFormat.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/badFormat.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/badFormat.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_01-1-2-0.00.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_01-1-2-0.00.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_01-1-2-0.00.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_01-1-2-0.00.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_02-1-4-0.00.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_02-1-4-0.00.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_02-1-4-0.00.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_02-1-4-0.00.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_03-2-4-0.00.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_03-2-4-0.00.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_03-2-4-0.00.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_03-2-4-0.00.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_04-6-6-0.00.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_04-6-6-0.00.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_04-6-6-0.00.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_04-6-6-0.00.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_05-21-10-0.00.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_05-21-10-0.00.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_05-21-10-0.00.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_05-21-10-0.00.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_06-22-10-0.00.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_06-22-10-0.00.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_06-22-10-0.00.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_06-22-10-0.00.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_07-26-11-0.00.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_07-26-11-0.00.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_07-26-11-0.00.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_07-26-11-0.00.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_08-24-10-0.03.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_08-24-10-0.03.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_08-24-10-0.03.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_08-24-10-0.03.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_09-11-7-0.07.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_09-11-7-0.07.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_09-11-7-0.07.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_09-11-7-0.07.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_10-12-7-0.52.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_10-12-7-0.52.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_10-12-7-0.52.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_10-12-7-0.52.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_11-12-8-0.83.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_11-12-8-0.83.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_11-12-8-0.83.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_11-12-8-0.83.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_12-19-9-3.40.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_12-19-9-3.40.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_12-19-9-3.40.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_12-19-9-3.40.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_13-23-10-4.72.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_13-23-10-4.72.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_13-23-10-4.72.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_13-23-10-4.72.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_14-15-8-7.34.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_14-15-8-7.34.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_14-15-8-7.34.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_14-15-8-7.34.txt diff --git a/go/tests/tetrisoptimizer/correct/samples/good_15-26-11-72.22.txt b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_15-26-11-72.22.txt similarity index 100% rename from go/tests/tetrisoptimizer/correct/samples/good_15-26-11-72.22.txt rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_15-26-11-72.22.txt diff --git a/go/tests/tetrisoptimizer/correct/solver.go b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/solver.go similarity index 100% rename from go/tests/tetrisoptimizer/correct/solver.go rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/solver.go diff --git a/go/tests/tetrisoptimizer/correct/tetrimino.go b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/tetrimino.go similarity index 100% rename from go/tests/tetrisoptimizer/correct/tetrimino.go rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/tetrimino.go diff --git a/go/tests/tetrisoptimizer/correct/validation.go b/go/tests/tetrisoptimizer/tetrisoptimizer_correct/validation.go similarity index 100% rename from go/tests/tetrisoptimizer/correct/validation.go rename to go/tests/tetrisoptimizer/tetrisoptimizer_correct/validation.go diff --git a/go/tests/union/correct/main.go b/go/tests/union/union_correct/main.go similarity index 100% rename from go/tests/union/correct/main.go rename to go/tests/union/union_correct/main.go diff --git a/go/tests/uniqueoccurences/correct/main.go b/go/tests/uniqueoccurences/uniqueoccurences_correct/main.go similarity index 100% rename from go/tests/uniqueoccurences/correct/main.go rename to go/tests/uniqueoccurences/uniqueoccurences_correct/main.go diff --git a/go/tests/wdmatch/correct/main.go b/go/tests/wdmatch/wdmatch_correct/main.go similarity index 100% rename from go/tests/wdmatch/correct/main.go rename to go/tests/wdmatch/wdmatch_correct/main.go