diff --git a/tests/calculation_addition.esc b/tests/calculation/calculation_addition.esc
similarity index 100%
rename from tests/calculation_addition.esc
rename to tests/calculation/calculation_addition.esc
diff --git a/tests/calculation/calculation_display_mode.esc b/tests/calculation/calculation_display_mode.esc
new file mode 100644
index 000000000..2cd2673b4
Binary files /dev/null and b/tests/calculation/calculation_display_mode.esc differ
diff --git a/tests/calculation/calculation_display_mode2.esc b/tests/calculation/calculation_display_mode2.esc
new file mode 100644
index 000000000..75e850ead
Binary files /dev/null and b/tests/calculation/calculation_display_mode2.esc differ
diff --git a/tests/calculation/calculation_division.esc b/tests/calculation/calculation_division.esc
new file mode 100644
index 000000000..0f6de3a03
--- /dev/null
+++ b/tests/calculation/calculation_division.esc
@@ -0,0 +1 @@
+ииииииии*и(и+иииии(и+иии(+иииии(и&иииииииииии
\ No newline at end of file
diff --git a/tests/calculation/calculation_exponential.esc b/tests/calculation/calculation_exponential.esc
new file mode 100644
index 000000000..f86bc648e
Binary files /dev/null and b/tests/calculation/calculation_exponential.esc differ
diff --git a/tests/calculation/calculation_logarithm.esc b/tests/calculation/calculation_logarithm.esc
new file mode 100644
index 000000000..8509b2d23
--- /dev/null
+++ b/tests/calculation/calculation_logarithm.esc
@@ -0,0 +1 @@
+ииииииии+иииии.и,иии+ииииииии+ииииииииии+ииии+ииииииии+иииии
\ No newline at end of file
diff --git a/tests/calculation/calculation_multiplication.esc b/tests/calculation/calculation_multiplication.esc
new file mode 100644
index 000000000..f83a2f2f5
Binary files /dev/null and b/tests/calculation/calculation_multiplication.esc differ
diff --git a/tests/calculation/calculation_natural_input.esc b/tests/calculation/calculation_natural_input.esc
new file mode 100644
index 000000000..42a3bc956
Binary files /dev/null and b/tests/calculation/calculation_natural_input.esc differ
diff --git a/tests/calculation/calculation_natural_input2.esc b/tests/calculation/calculation_natural_input2.esc
new file mode 100644
index 000000000..c8e9d4d64
Binary files /dev/null and b/tests/calculation/calculation_natural_input2.esc differ
diff --git a/tests/calculation/calculation_natural_input3.esc b/tests/calculation/calculation_natural_input3.esc
new file mode 100644
index 000000000..21df972bc
Binary files /dev/null and b/tests/calculation/calculation_natural_input3.esc differ
diff --git a/tests/calculation/calculation_natural_input4.esc b/tests/calculation/calculation_natural_input4.esc
new file mode 100644
index 000000000..c25a9fed3
Binary files /dev/null and b/tests/calculation/calculation_natural_input4.esc differ
diff --git a/tests/calculation/calculation_polar.esc b/tests/calculation/calculation_polar.esc
new file mode 100644
index 000000000..2cb18300a
Binary files /dev/null and b/tests/calculation/calculation_polar.esc differ
diff --git a/tests/calculation/calculation_power.esc b/tests/calculation/calculation_power.esc
new file mode 100644
index 000000000..c272a0ef9
Binary files /dev/null and b/tests/calculation/calculation_power.esc differ
diff --git a/tests/calculation/calculation_radian.esc b/tests/calculation/calculation_radian.esc
new file mode 100644
index 000000000..aeb91526c
Binary files /dev/null and b/tests/calculation/calculation_radian.esc differ
diff --git a/tests/calculation/calculation_root.esc b/tests/calculation/calculation_root.esc
new file mode 100644
index 000000000..193da900e
Binary files /dev/null and b/tests/calculation/calculation_root.esc differ
diff --git a/tests/calculation/calculation_subtraction.esc b/tests/calculation/calculation_subtraction.esc
new file mode 100644
index 000000000..977d766f4
Binary files /dev/null and b/tests/calculation/calculation_subtraction.esc differ
diff --git a/tests/calculation/calculation_symbol.esc b/tests/calculation/calculation_symbol.esc
new file mode 100644
index 000000000..a596b6ceb
Binary files /dev/null and b/tests/calculation/calculation_symbol.esc differ
diff --git a/tests/calculation_syntax_error.esc b/tests/calculation/calculation_syntax_error.esc
similarity index 100%
rename from tests/calculation_syntax_error.esc
rename to tests/calculation/calculation_syntax_error.esc
diff --git a/tests/calculation/calculation_trigonometry.esc b/tests/calculation/calculation_trigonometry.esc
new file mode 100644
index 000000000..c4c687d14
--- /dev/null
+++ b/tests/calculation/calculation_trigonometry.esc
@@ -0,0 +1 @@
+иииииииииии*-ииииииии+и-иииииNиииииOиии-+,иииииPи+,+(ииииииииииииии+и(+иииииии
\ No newline at end of file
diff --git a/tests/graph_calculation.esc b/tests/function/function_calculation.esc
similarity index 100%
rename from tests/graph_calculation.esc
rename to tests/function/function_calculation.esc
diff --git a/tests/graph_graph.esc b/tests/function/function_graph.esc
similarity index 100%
rename from tests/graph_graph.esc
rename to tests/function/function_graph.esc
diff --git a/tests/graph_list.esc b/tests/function/function_list.esc
similarity index 100%
rename from tests/graph_list.esc
rename to tests/function/function_list.esc
diff --git a/tests/graph_sine.esc b/tests/function/function_sine.esc
similarity index 100%
rename from tests/graph_sine.esc
rename to tests/function/function_sine.esc
diff --git a/tests/graph_table.esc b/tests/function/function_table.esc
similarity index 100%
rename from tests/graph_table.esc
rename to tests/function/function_table.esc
diff --git a/tests/probability_binomial.esc b/tests/probability/probability_binomial.esc
similarity index 100%
rename from tests/probability_binomial.esc
rename to tests/probability/probability_binomial.esc
diff --git a/tests/probability/probability_exponential.esc b/tests/probability/probability_exponential.esc
new file mode 100644
index 000000000..b21ba2f0f
Binary files /dev/null and b/tests/probability/probability_exponential.esc differ
diff --git a/tests/probability/probability_normal.esc b/tests/probability/probability_normal.esc
new file mode 100644
index 000000000..a45e6b569
Binary files /dev/null and b/tests/probability/probability_normal.esc differ
diff --git a/tests/probability/probability_poisson.esc b/tests/probability/probability_poisson.esc
new file mode 100644
index 000000000..7052cec94
Binary files /dev/null and b/tests/probability/probability_poisson.esc differ
diff --git a/tests/probability/probability_uniform.esc b/tests/probability/probability_uniform.esc
new file mode 100644
index 000000000..9b3352f27
Binary files /dev/null and b/tests/probability/probability_uniform.esc differ
diff --git a/tests/python/python_console.esc b/tests/python/python_console.esc
new file mode 100644
index 000000000..6fed2db02
Binary files /dev/null and b/tests/python/python_console.esc differ
diff --git a/tests/python/python_editor.esc b/tests/python/python_editor.esc
new file mode 100644
index 000000000..525e28c5d
Binary files /dev/null and b/tests/python/python_editor.esc differ
diff --git a/tests/python/python_menu.esc b/tests/python/python_menu.esc
new file mode 100644
index 000000000..334728680
Binary files /dev/null and b/tests/python/python_menu.esc differ
diff --git a/tests/regression/regression_calculation.esc b/tests/regression/regression_calculation.esc
new file mode 100644
index 000000000..fc28d9b58
Binary files /dev/null and b/tests/regression/regression_calculation.esc differ
diff --git a/tests/regression/regression_graph.esc b/tests/regression/regression_graph.esc
new file mode 100644
index 000000000..46dfeb0cd
Binary files /dev/null and b/tests/regression/regression_graph.esc differ
diff --git a/tests/regression/regression_list.esc b/tests/regression/regression_list.esc
new file mode 100644
index 000000000..4e8f17554
Binary files /dev/null and b/tests/regression/regression_list.esc differ
diff --git a/tests/sequence_graph.esc b/tests/sequence/sequence_graph.esc
similarity index 100%
rename from tests/sequence_graph.esc
rename to tests/sequence/sequence_graph.esc
diff --git a/tests/sequence_list.esc b/tests/sequence/sequence_list.esc
similarity index 100%
rename from tests/sequence_list.esc
rename to tests/sequence/sequence_list.esc
diff --git a/tests/sequences_recurring.esc b/tests/sequence/sequence_recurring.esc
similarity index 100%
rename from tests/sequences_recurring.esc
rename to tests/sequence/sequence_recurring.esc
diff --git a/tests/sequence_table.esc b/tests/sequence/sequence_table.esc
similarity index 100%
rename from tests/sequence_table.esc
rename to tests/sequence/sequence_table.esc
diff --git a/tests/settings/settings.esc b/tests/settings/settings.esc
new file mode 100644
index 000000000..813a60463
Binary files /dev/null and b/tests/settings/settings.esc differ
diff --git a/tests/settings_language.esc b/tests/settings/settings_language.esc
similarity index 100%
rename from tests/settings_language.esc
rename to tests/settings/settings_language.esc
diff --git a/tests/shared/toolbox.esc b/tests/shared/toolbox.esc
new file mode 100644
index 000000000..c791869cd
Binary files /dev/null and b/tests/shared/toolbox.esc differ
diff --git a/tests/shared/variable_box.esc b/tests/shared/variable_box.esc
new file mode 100644
index 000000000..1cf24666d
Binary files /dev/null and b/tests/shared/variable_box.esc differ
diff --git a/tests/statistics/statistics_box.esc b/tests/statistics/statistics_box.esc
new file mode 100644
index 000000000..e11040656
Binary files /dev/null and b/tests/statistics/statistics_box.esc differ
diff --git a/tests/statistics/statistics_calculation.esc b/tests/statistics/statistics_calculation.esc
new file mode 100644
index 000000000..d06953abe
Binary files /dev/null and b/tests/statistics/statistics_calculation.esc differ
diff --git a/tests/statistics/statistics_histo.esc b/tests/statistics/statistics_histo.esc
new file mode 100644
index 000000000..aaf3d8cf2
Binary files /dev/null and b/tests/statistics/statistics_histo.esc differ
diff --git a/tests/statistics/statistics_list.esc b/tests/statistics/statistics_list.esc
new file mode 100644
index 000000000..86aaac68e
Binary files /dev/null and b/tests/statistics/statistics_list.esc differ
diff --git a/tests/statistics_values.esc b/tests/statistics/statistics_values.esc
similarity index 100%
rename from tests/statistics_values.esc
rename to tests/statistics/statistics_values.esc