diff --git a/tests/functional/arno/derived_tables/01_test.py b/tests/functional/arno/derived_tables/test_01.py similarity index 100% rename from tests/functional/arno/derived_tables/01_test.py rename to tests/functional/arno/derived_tables/test_01.py diff --git a/tests/functional/arno/derived_tables/02_test.py b/tests/functional/arno/derived_tables/test_02.py similarity index 100% rename from tests/functional/arno/derived_tables/02_test.py rename to tests/functional/arno/derived_tables/test_02.py diff --git a/tests/functional/arno/derived_tables/03_test.py b/tests/functional/arno/derived_tables/test_03.py similarity index 100% rename from tests/functional/arno/derived_tables/03_test.py rename to tests/functional/arno/derived_tables/test_03.py diff --git a/tests/functional/arno/derived_tables/04_test.py b/tests/functional/arno/derived_tables/test_04.py similarity index 100% rename from tests/functional/arno/derived_tables/04_test.py rename to tests/functional/arno/derived_tables/test_04.py diff --git a/tests/functional/arno/derived_tables/05_test.py b/tests/functional/arno/derived_tables/test_05.py similarity index 100% rename from tests/functional/arno/derived_tables/05_test.py rename to tests/functional/arno/derived_tables/test_05.py diff --git a/tests/functional/arno/derived_tables/06_test.py b/tests/functional/arno/derived_tables/test_06.py similarity index 100% rename from tests/functional/arno/derived_tables/06_test.py rename to tests/functional/arno/derived_tables/test_06.py diff --git a/tests/functional/arno/derived_tables/07_test.py b/tests/functional/arno/derived_tables/test_07.py similarity index 100% rename from tests/functional/arno/derived_tables/07_test.py rename to tests/functional/arno/derived_tables/test_07.py diff --git a/tests/functional/arno/derived_tables/08_test.py b/tests/functional/arno/derived_tables/test_08.py similarity index 100% rename from tests/functional/arno/derived_tables/08_test.py rename to tests/functional/arno/derived_tables/test_08.py diff --git a/tests/functional/arno/derived_tables/09_test.py b/tests/functional/arno/derived_tables/test_09.py similarity index 100% rename from tests/functional/arno/derived_tables/09_test.py rename to tests/functional/arno/derived_tables/test_09.py diff --git a/tests/functional/arno/derived_tables/10_test.py b/tests/functional/arno/derived_tables/test_10.py similarity index 100% rename from tests/functional/arno/derived_tables/10_test.py rename to tests/functional/arno/derived_tables/test_10.py diff --git a/tests/functional/arno/derived_tables/11_test.py b/tests/functional/arno/derived_tables/test_11.py similarity index 100% rename from tests/functional/arno/derived_tables/11_test.py rename to tests/functional/arno/derived_tables/test_11.py diff --git a/tests/functional/arno/derived_tables/12_test.py b/tests/functional/arno/derived_tables/test_12.py similarity index 100% rename from tests/functional/arno/derived_tables/12_test.py rename to tests/functional/arno/derived_tables/test_12.py diff --git a/tests/functional/arno/derived_tables/13_test.py b/tests/functional/arno/derived_tables/test_13.py similarity index 100% rename from tests/functional/arno/derived_tables/13_test.py rename to tests/functional/arno/derived_tables/test_13.py diff --git a/tests/functional/arno/derived_tables/14_test.py b/tests/functional/arno/derived_tables/test_14.py similarity index 100% rename from tests/functional/arno/derived_tables/14_test.py rename to tests/functional/arno/derived_tables/test_14.py diff --git a/tests/functional/arno/derived_tables/15_test.py b/tests/functional/arno/derived_tables/test_15.py similarity index 100% rename from tests/functional/arno/derived_tables/15_test.py rename to tests/functional/arno/derived_tables/test_15.py diff --git a/tests/functional/arno/derived_tables/16_test.py b/tests/functional/arno/derived_tables/test_16.py similarity index 100% rename from tests/functional/arno/derived_tables/16_test.py rename to tests/functional/arno/derived_tables/test_16.py diff --git a/tests/functional/arno/derived_tables/17_test.py b/tests/functional/arno/derived_tables/test_17.py similarity index 100% rename from tests/functional/arno/derived_tables/17_test.py rename to tests/functional/arno/derived_tables/test_17.py diff --git a/tests/functional/arno/derived_tables/18_test.py b/tests/functional/arno/derived_tables/test_18.py similarity index 100% rename from tests/functional/arno/derived_tables/18_test.py rename to tests/functional/arno/derived_tables/test_18.py diff --git a/tests/functional/arno/derived_tables/19_test.py b/tests/functional/arno/derived_tables/test_19.py similarity index 100% rename from tests/functional/arno/derived_tables/19_test.py rename to tests/functional/arno/derived_tables/test_19.py diff --git a/tests/functional/arno/derived_tables/20_test.py b/tests/functional/arno/derived_tables/test_20.py similarity index 100% rename from tests/functional/arno/derived_tables/20_test.py rename to tests/functional/arno/derived_tables/test_20.py diff --git a/tests/functional/arno/derived_tables/21_test.py b/tests/functional/arno/derived_tables/test_21.py similarity index 100% rename from tests/functional/arno/derived_tables/21_test.py rename to tests/functional/arno/derived_tables/test_21.py diff --git a/tests/functional/arno/derived_tables/22_test.py b/tests/functional/arno/derived_tables/test_22.py similarity index 100% rename from tests/functional/arno/derived_tables/22_test.py rename to tests/functional/arno/derived_tables/test_22.py diff --git a/tests/functional/arno/indices/lower_bound_asc_02_segments_01_test.py b/tests/functional/arno/indices/test_lower_bound_asc_02_segments_01.py similarity index 100% rename from tests/functional/arno/indices/lower_bound_asc_02_segments_01_test.py rename to tests/functional/arno/indices/test_lower_bound_asc_02_segments_01.py diff --git a/tests/functional/arno/indices/lower_bound_desc_02_segments_01_test.py b/tests/functional/arno/indices/test_lower_bound_desc_02_segments_01.py similarity index 100% rename from tests/functional/arno/indices/lower_bound_desc_02_segments_01_test.py rename to tests/functional/arno/indices/test_lower_bound_desc_02_segments_01.py diff --git a/tests/functional/arno/indices/starting_with_01_test.py b/tests/functional/arno/indices/test_starting_with_01.py similarity index 100% rename from tests/functional/arno/indices/starting_with_01_test.py rename to tests/functional/arno/indices/test_starting_with_01.py diff --git a/tests/functional/arno/indices/starting_with_02_test.py b/tests/functional/arno/indices/test_starting_with_02.py similarity index 100% rename from tests/functional/arno/indices/starting_with_02_test.py rename to tests/functional/arno/indices/test_starting_with_02.py diff --git a/tests/functional/arno/indices/timestamps_01_test.py b/tests/functional/arno/indices/test_timestamps_01.py similarity index 100% rename from tests/functional/arno/indices/timestamps_01_test.py rename to tests/functional/arno/indices/test_timestamps_01.py diff --git a/tests/functional/arno/indices/upper_bound_asc_01_segments_01_test.py b/tests/functional/arno/indices/test_upper_bound_asc_01_segments_01.py similarity index 100% rename from tests/functional/arno/indices/upper_bound_asc_01_segments_01_test.py rename to tests/functional/arno/indices/test_upper_bound_asc_01_segments_01.py diff --git a/tests/functional/arno/indices/upper_bound_asc_01_segments_02_test.py b/tests/functional/arno/indices/test_upper_bound_asc_01_segments_02.py similarity index 100% rename from tests/functional/arno/indices/upper_bound_asc_01_segments_02_test.py rename to tests/functional/arno/indices/test_upper_bound_asc_01_segments_02.py diff --git a/tests/functional/arno/indices/upper_bound_asc_01_segments_03_test.py b/tests/functional/arno/indices/test_upper_bound_asc_01_segments_03.py similarity index 100% rename from tests/functional/arno/indices/upper_bound_asc_01_segments_03_test.py rename to tests/functional/arno/indices/test_upper_bound_asc_01_segments_03.py diff --git a/tests/functional/arno/indices/upper_bound_asc_01_segments_04_test.py b/tests/functional/arno/indices/test_upper_bound_asc_01_segments_04.py similarity index 100% rename from tests/functional/arno/indices/upper_bound_asc_01_segments_04_test.py rename to tests/functional/arno/indices/test_upper_bound_asc_01_segments_04.py diff --git a/tests/functional/arno/indices/upper_bound_asc_02_segments_01_test.py b/tests/functional/arno/indices/test_upper_bound_asc_02_segments_01.py similarity index 100% rename from tests/functional/arno/indices/upper_bound_asc_02_segments_01_test.py rename to tests/functional/arno/indices/test_upper_bound_asc_02_segments_01.py diff --git a/tests/functional/arno/indices/upper_bound_desc_01_segments_01_test.py b/tests/functional/arno/indices/test_upper_bound_desc_01_segments_01.py similarity index 100% rename from tests/functional/arno/indices/upper_bound_desc_01_segments_01_test.py rename to tests/functional/arno/indices/test_upper_bound_desc_01_segments_01.py diff --git a/tests/functional/arno/indices/upper_bound_desc_01_segments_02_test.py b/tests/functional/arno/indices/test_upper_bound_desc_01_segments_02.py similarity index 100% rename from tests/functional/arno/indices/upper_bound_desc_01_segments_02_test.py rename to tests/functional/arno/indices/test_upper_bound_desc_01_segments_02.py diff --git a/tests/functional/arno/indices/upper_bound_desc_02_segments_01_test.py b/tests/functional/arno/indices/test_upper_bound_desc_02_segments_01.py similarity index 100% rename from tests/functional/arno/indices/upper_bound_desc_02_segments_01_test.py rename to tests/functional/arno/indices/test_upper_bound_desc_02_segments_01.py diff --git a/tests/functional/arno/indices/upper_lower_bounds_01_test.py b/tests/functional/arno/indices/test_upper_lower_bounds_01.py similarity index 100% rename from tests/functional/arno/indices/upper_lower_bounds_01_test.py rename to tests/functional/arno/indices/test_upper_lower_bounds_01.py diff --git a/tests/functional/arno/indices/upper_lower_bounds_02_test.py b/tests/functional/arno/indices/test_upper_lower_bounds_02.py similarity index 100% rename from tests/functional/arno/indices/upper_lower_bounds_02_test.py rename to tests/functional/arno/indices/test_upper_lower_bounds_02.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_01_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_01.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_01_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_01.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_02_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_02.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_02_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_02.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_03_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_03.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_03_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_03.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_04_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_04.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_04_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_04.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_05_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_05.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_05_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_05.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_06_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_06.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_06_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_06.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_07_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_07.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_07_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_07.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_08_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_08.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_08_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_08.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_09_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_09.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_09_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_09.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_10_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_10.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_10_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_10.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_11_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_11.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_11_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_11.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_12_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_12.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_12_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_12.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_13_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_13.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_13_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_13.py diff --git a/tests/functional/arno/optimizer/opt_aggregate_distribution_14_test.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_14.py similarity index 100% rename from tests/functional/arno/optimizer/opt_aggregate_distribution_14_test.py rename to tests/functional/arno/optimizer/test_opt_aggregate_distribution_14.py diff --git a/tests/functional/arno/optimizer/opt_avoid_index_usage_test.py b/tests/functional/arno/optimizer/test_opt_avoid_index_usage.py similarity index 100% rename from tests/functional/arno/optimizer/opt_avoid_index_usage_test.py rename to tests/functional/arno/optimizer/test_opt_avoid_index_usage.py diff --git a/tests/functional/arno/optimizer/opt_full_join_01_test.py b/tests/functional/arno/optimizer/test_opt_full_join_01.py similarity index 100% rename from tests/functional/arno/optimizer/opt_full_join_01_test.py rename to tests/functional/arno/optimizer/test_opt_full_join_01.py diff --git a/tests/functional/arno/optimizer/opt_full_join_02_test.py b/tests/functional/arno/optimizer/test_opt_full_join_02.py similarity index 100% rename from tests/functional/arno/optimizer/opt_full_join_02_test.py rename to tests/functional/arno/optimizer/test_opt_full_join_02.py diff --git a/tests/functional/arno/optimizer/opt_full_join_03_test.py b/tests/functional/arno/optimizer/test_opt_full_join_03.py similarity index 100% rename from tests/functional/arno/optimizer/opt_full_join_03_test.py rename to tests/functional/arno/optimizer/test_opt_full_join_03.py diff --git a/tests/functional/arno/optimizer/opt_full_join_04_test.py b/tests/functional/arno/optimizer/test_opt_full_join_04.py similarity index 100% rename from tests/functional/arno/optimizer/opt_full_join_04_test.py rename to tests/functional/arno/optimizer/test_opt_full_join_04.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_01_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_01.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_01_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_01.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_02_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_02.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_02_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_02.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_03_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_03.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_03_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_03.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_04_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_04.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_04_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_04.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_05_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_05.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_05_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_05.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_06_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_06.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_06_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_06.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_07_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_07.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_07_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_07.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_08_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_08.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_08_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_08.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_09_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_09.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_09_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_09.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_10_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_10.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_10_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_10.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_merge_01_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_01.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_merge_01_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_merge_01.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_merge_02_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_02.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_merge_02_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_merge_02.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_merge_03_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_03.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_merge_03_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_merge_03.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_merge_04_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_04.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_merge_04_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_merge_04.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_merge_05_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_05.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_merge_05_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_merge_05.py diff --git a/tests/functional/arno/optimizer/opt_inner_join_merge_06_test.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_06.py similarity index 100% rename from tests/functional/arno/optimizer/opt_inner_join_merge_06_test.py rename to tests/functional/arno/optimizer/test_opt_inner_join_merge_06.py diff --git a/tests/functional/arno/optimizer/opt_left_join_01_test.py b/tests/functional/arno/optimizer/test_opt_left_join_01.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_01_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_01.py diff --git a/tests/functional/arno/optimizer/opt_left_join_02_test.py b/tests/functional/arno/optimizer/test_opt_left_join_02.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_02_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_02.py diff --git a/tests/functional/arno/optimizer/opt_left_join_03_test.py b/tests/functional/arno/optimizer/test_opt_left_join_03.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_03_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_03.py diff --git a/tests/functional/arno/optimizer/opt_left_join_04_test.py b/tests/functional/arno/optimizer/test_opt_left_join_04.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_04_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_04.py diff --git a/tests/functional/arno/optimizer/opt_left_join_05_test.py b/tests/functional/arno/optimizer/test_opt_left_join_05.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_05_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_05.py diff --git a/tests/functional/arno/optimizer/opt_left_join_06_test.py b/tests/functional/arno/optimizer/test_opt_left_join_06.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_06_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_06.py diff --git a/tests/functional/arno/optimizer/opt_left_join_07_test.py b/tests/functional/arno/optimizer/test_opt_left_join_07.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_07_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_07.py diff --git a/tests/functional/arno/optimizer/opt_left_join_08_test.py b/tests/functional/arno/optimizer/test_opt_left_join_08.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_08_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_08.py diff --git a/tests/functional/arno/optimizer/opt_left_join_09_test.py b/tests/functional/arno/optimizer/test_opt_left_join_09.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_09_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_09.py diff --git a/tests/functional/arno/optimizer/opt_left_join_10_test.py b/tests/functional/arno/optimizer/test_opt_left_join_10.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_10_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_10.py diff --git a/tests/functional/arno/optimizer/opt_left_join_11_test.py b/tests/functional/arno/optimizer/test_opt_left_join_11.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_11_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_11.py diff --git a/tests/functional/arno/optimizer/opt_left_join_12_test.py b/tests/functional/arno/optimizer/test_opt_left_join_12.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_12_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_12.py diff --git a/tests/functional/arno/optimizer/opt_left_join_13_test.py b/tests/functional/arno/optimizer/test_opt_left_join_13.py similarity index 100% rename from tests/functional/arno/optimizer/opt_left_join_13_test.py rename to tests/functional/arno/optimizer/test_opt_left_join_13.py diff --git a/tests/functional/arno/optimizer/opt_mixed_joins_01_test.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_01.py similarity index 100% rename from tests/functional/arno/optimizer/opt_mixed_joins_01_test.py rename to tests/functional/arno/optimizer/test_opt_mixed_joins_01.py diff --git a/tests/functional/arno/optimizer/opt_mixed_joins_02_test.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_02.py similarity index 100% rename from tests/functional/arno/optimizer/opt_mixed_joins_02_test.py rename to tests/functional/arno/optimizer/test_opt_mixed_joins_02.py diff --git a/tests/functional/arno/optimizer/opt_mixed_joins_03_test.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_03.py similarity index 100% rename from tests/functional/arno/optimizer/opt_mixed_joins_03_test.py rename to tests/functional/arno/optimizer/test_opt_mixed_joins_03.py diff --git a/tests/functional/arno/optimizer/opt_mixed_joins_04_test.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_04.py similarity index 100% rename from tests/functional/arno/optimizer/opt_mixed_joins_04_test.py rename to tests/functional/arno/optimizer/test_opt_mixed_joins_04.py diff --git a/tests/functional/arno/optimizer/opt_mixed_joins_05_test.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_05.py similarity index 100% rename from tests/functional/arno/optimizer/opt_mixed_joins_05_test.py rename to tests/functional/arno/optimizer/test_opt_mixed_joins_05.py diff --git a/tests/functional/arno/optimizer/opt_mixed_joins_06_test.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_06.py similarity index 100% rename from tests/functional/arno/optimizer/opt_mixed_joins_06_test.py rename to tests/functional/arno/optimizer/test_opt_mixed_joins_06.py diff --git a/tests/functional/arno/optimizer/opt_multi_index_selection_01_test.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_01.py similarity index 100% rename from tests/functional/arno/optimizer/opt_multi_index_selection_01_test.py rename to tests/functional/arno/optimizer/test_opt_multi_index_selection_01.py diff --git a/tests/functional/arno/optimizer/opt_multi_index_selection_02_test.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_02.py similarity index 100% rename from tests/functional/arno/optimizer/opt_multi_index_selection_02_test.py rename to tests/functional/arno/optimizer/test_opt_multi_index_selection_02.py diff --git a/tests/functional/arno/optimizer/opt_multi_index_selection_03_test.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_03.py similarity index 100% rename from tests/functional/arno/optimizer/opt_multi_index_selection_03_test.py rename to tests/functional/arno/optimizer/test_opt_multi_index_selection_03.py diff --git a/tests/functional/arno/optimizer/opt_multi_index_selection_04_test.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_04.py similarity index 100% rename from tests/functional/arno/optimizer/opt_multi_index_selection_04_test.py rename to tests/functional/arno/optimizer/test_opt_multi_index_selection_04.py diff --git a/tests/functional/arno/optimizer/opt_multi_index_selection_05_test.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_05.py similarity index 100% rename from tests/functional/arno/optimizer/opt_multi_index_selection_05_test.py rename to tests/functional/arno/optimizer/test_opt_multi_index_selection_05.py diff --git a/tests/functional/arno/optimizer/opt_multi_index_selection_07_test.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_07.py similarity index 100% rename from tests/functional/arno/optimizer/opt_multi_index_selection_07_test.py rename to tests/functional/arno/optimizer/test_opt_multi_index_selection_07.py diff --git a/tests/functional/arno/optimizer/opt_multi_index_selection_08_test.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_08.py similarity index 100% rename from tests/functional/arno/optimizer/opt_multi_index_selection_08_test.py rename to tests/functional/arno/optimizer/test_opt_multi_index_selection_08.py diff --git a/tests/functional/arno/optimizer/opt_selectivity_01_test.py b/tests/functional/arno/optimizer/test_opt_selectivity_01.py similarity index 100% rename from tests/functional/arno/optimizer/opt_selectivity_01_test.py rename to tests/functional/arno/optimizer/test_opt_selectivity_01.py diff --git a/tests/functional/arno/optimizer/opt_selectivity_02_test.py b/tests/functional/arno/optimizer/test_opt_selectivity_02.py similarity index 100% rename from tests/functional/arno/optimizer/opt_selectivity_02_test.py rename to tests/functional/arno/optimizer/test_opt_selectivity_02.py diff --git a/tests/functional/arno/optimizer/opt_selectivity_03_test.py b/tests/functional/arno/optimizer/test_opt_selectivity_03.py similarity index 100% rename from tests/functional/arno/optimizer/opt_selectivity_03_test.py rename to tests/functional/arno/optimizer/test_opt_selectivity_03.py diff --git a/tests/functional/arno/optimizer/opt_single_index_selection_01_test.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_01.py similarity index 100% rename from tests/functional/arno/optimizer/opt_single_index_selection_01_test.py rename to tests/functional/arno/optimizer/test_opt_single_index_selection_01.py diff --git a/tests/functional/arno/optimizer/opt_single_index_selection_02_test.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_02.py similarity index 100% rename from tests/functional/arno/optimizer/opt_single_index_selection_02_test.py rename to tests/functional/arno/optimizer/test_opt_single_index_selection_02.py diff --git a/tests/functional/arno/optimizer/opt_single_index_selection_03_test.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_03.py similarity index 100% rename from tests/functional/arno/optimizer/opt_single_index_selection_03_test.py rename to tests/functional/arno/optimizer/test_opt_single_index_selection_03.py diff --git a/tests/functional/arno/optimizer/opt_single_index_selection_05_test.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_05.py similarity index 100% rename from tests/functional/arno/optimizer/opt_single_index_selection_05_test.py rename to tests/functional/arno/optimizer/test_opt_single_index_selection_05.py diff --git a/tests/functional/arno/optimizer/opt_single_index_selection_06_test.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_06.py similarity index 100% rename from tests/functional/arno/optimizer/opt_single_index_selection_06_test.py rename to tests/functional/arno/optimizer/test_opt_single_index_selection_06.py diff --git a/tests/functional/arno/optimizer/opt_single_index_selection_07_test.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_07.py similarity index 100% rename from tests/functional/arno/optimizer/opt_single_index_selection_07_test.py rename to tests/functional/arno/optimizer/test_opt_single_index_selection_07.py diff --git a/tests/functional/arno/optimizer/opt_single_index_selection_08_test.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_08.py similarity index 100% rename from tests/functional/arno/optimizer/opt_single_index_selection_08_test.py rename to tests/functional/arno/optimizer/test_opt_single_index_selection_08.py diff --git a/tests/functional/arno/optimizer/opt_single_index_selection_09_test.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_09.py similarity index 100% rename from tests/functional/arno/optimizer/opt_single_index_selection_09_test.py rename to tests/functional/arno/optimizer/test_opt_single_index_selection_09.py diff --git a/tests/functional/arno/optimizer/opt_single_index_selection_10_test.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_10.py similarity index 100% rename from tests/functional/arno/optimizer/opt_single_index_selection_10_test.py rename to tests/functional/arno/optimizer/test_opt_single_index_selection_10.py diff --git a/tests/functional/arno/optimizer/opt_single_index_selection_11_test.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_11.py similarity index 100% rename from tests/functional/arno/optimizer/opt_single_index_selection_11_test.py rename to tests/functional/arno/optimizer/test_opt_single_index_selection_11.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_01_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_01.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_01_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_01.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_02_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_02.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_02_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_02.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_03_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_03.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_03_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_03.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_04_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_04.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_04_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_04.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_05_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_05.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_05_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_05.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_06_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_06.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_06_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_06.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_07_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_07.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_07_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_07.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_08_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_08.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_08_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_08.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_09_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_09.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_09_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_09.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_10_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_10.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_10_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_10.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_11_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_11.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_11_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_11.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_12_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_12.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_12_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_12.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_13_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_13.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_13_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_13.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_14_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_14.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_14_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_14.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_15_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_15.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_15_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_15.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_16_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_16.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_16_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_16.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_17_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_17.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_17_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_17.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_18_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_18.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_18_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_18.py diff --git a/tests/functional/arno/optimizer/opt_sort_by_index_19_test.py b/tests/functional/arno/optimizer/test_opt_sort_by_index_19.py similarity index 100% rename from tests/functional/arno/optimizer/opt_sort_by_index_19_test.py rename to tests/functional/arno/optimizer/test_opt_sort_by_index_19.py diff --git a/tests/functional/basic/db/01_test.py b/tests/functional/basic/db/test_01.py similarity index 100% rename from tests/functional/basic/db/01_test.py rename to tests/functional/basic/db/test_01.py diff --git a/tests/functional/basic/db/02_test.py b/tests/functional/basic/db/test_02.py similarity index 100% rename from tests/functional/basic/db/02_test.py rename to tests/functional/basic/db/test_02.py diff --git a/tests/functional/basic/db/03_test.py b/tests/functional/basic/db/test_03.py similarity index 100% rename from tests/functional/basic/db/03_test.py rename to tests/functional/basic/db/test_03.py diff --git a/tests/functional/basic/db/04_test.py b/tests/functional/basic/db/test_04.py similarity index 100% rename from tests/functional/basic/db/04_test.py rename to tests/functional/basic/db/test_04.py diff --git a/tests/functional/basic/db/05_test.py b/tests/functional/basic/db/test_05.py similarity index 100% rename from tests/functional/basic/db/05_test.py rename to tests/functional/basic/db/test_05.py diff --git a/tests/functional/basic/db/06_test.py b/tests/functional/basic/db/test_06.py similarity index 100% rename from tests/functional/basic/db/06_test.py rename to tests/functional/basic/db/test_06.py diff --git a/tests/functional/basic/db/07_test.py b/tests/functional/basic/db/test_07.py similarity index 100% rename from tests/functional/basic/db/07_test.py rename to tests/functional/basic/db/test_07.py diff --git a/tests/functional/basic/db/08_test.py b/tests/functional/basic/db/test_08.py similarity index 100% rename from tests/functional/basic/db/08_test.py rename to tests/functional/basic/db/test_08.py diff --git a/tests/functional/basic/db/09_test.py b/tests/functional/basic/db/test_09.py similarity index 100% rename from tests/functional/basic/db/09_test.py rename to tests/functional/basic/db/test_09.py diff --git a/tests/functional/basic/db/10_test.py b/tests/functional/basic/db/test_10.py similarity index 100% rename from tests/functional/basic/db/10_test.py rename to tests/functional/basic/db/test_10.py diff --git a/tests/functional/basic/db/11_test.py b/tests/functional/basic/db/test_11.py similarity index 100% rename from tests/functional/basic/db/11_test.py rename to tests/functional/basic/db/test_11.py diff --git a/tests/functional/basic/db/12_test.py b/tests/functional/basic/db/test_12.py similarity index 100% rename from tests/functional/basic/db/12_test.py rename to tests/functional/basic/db/test_12.py diff --git a/tests/functional/basic/db/13_test.py b/tests/functional/basic/db/test_13.py similarity index 100% rename from tests/functional/basic/db/13_test.py rename to tests/functional/basic/db/test_13.py diff --git a/tests/functional/basic/db/14_test.py b/tests/functional/basic/db/test_14.py similarity index 100% rename from tests/functional/basic/db/14_test.py rename to tests/functional/basic/db/test_14.py diff --git a/tests/functional/basic/db/15_test.py b/tests/functional/basic/db/test_15.py similarity index 100% rename from tests/functional/basic/db/15_test.py rename to tests/functional/basic/db/test_15.py diff --git a/tests/functional/basic/db/16_test.py b/tests/functional/basic/db/test_16.py similarity index 100% rename from tests/functional/basic/db/16_test.py rename to tests/functional/basic/db/test_16.py diff --git a/tests/functional/basic/db/17_test.py b/tests/functional/basic/db/test_17.py similarity index 100% rename from tests/functional/basic/db/17_test.py rename to tests/functional/basic/db/test_17.py diff --git a/tests/functional/basic/db/18_test.py b/tests/functional/basic/db/test_18.py similarity index 100% rename from tests/functional/basic/db/18_test.py rename to tests/functional/basic/db/test_18.py diff --git a/tests/functional/basic/db/19_test.py b/tests/functional/basic/db/test_19.py similarity index 100% rename from tests/functional/basic/db/19_test.py rename to tests/functional/basic/db/test_19.py diff --git a/tests/functional/basic/db/20_test.py b/tests/functional/basic/db/test_20.py similarity index 100% rename from tests/functional/basic/db/20_test.py rename to tests/functional/basic/db/test_20.py diff --git a/tests/functional/basic/db/21_test.py b/tests/functional/basic/db/test_21.py similarity index 100% rename from tests/functional/basic/db/21_test.py rename to tests/functional/basic/db/test_21.py diff --git a/tests/functional/basic/db/22_test.py b/tests/functional/basic/db/test_22.py similarity index 100% rename from tests/functional/basic/db/22_test.py rename to tests/functional/basic/db/test_22.py diff --git a/tests/functional/basic/db/23_test.py b/tests/functional/basic/db/test_23.py similarity index 100% rename from tests/functional/basic/db/23_test.py rename to tests/functional/basic/db/test_23.py diff --git a/tests/functional/basic/db/24_test.py b/tests/functional/basic/db/test_24.py similarity index 100% rename from tests/functional/basic/db/24_test.py rename to tests/functional/basic/db/test_24.py diff --git a/tests/functional/basic/db/25_test.py b/tests/functional/basic/db/test_25.py similarity index 100% rename from tests/functional/basic/db/25_test.py rename to tests/functional/basic/db/test_25.py diff --git a/tests/functional/basic/db/26_test.py b/tests/functional/basic/db/test_26.py similarity index 100% rename from tests/functional/basic/db/26_test.py rename to tests/functional/basic/db/test_26.py diff --git a/tests/functional/basic/db/27_test.py b/tests/functional/basic/db/test_27.py similarity index 100% rename from tests/functional/basic/db/27_test.py rename to tests/functional/basic/db/test_27.py diff --git a/tests/functional/basic/db/28_test.py b/tests/functional/basic/db/test_28.py similarity index 100% rename from tests/functional/basic/db/28_test.py rename to tests/functional/basic/db/test_28.py diff --git a/tests/functional/basic/db/29_test.py b/tests/functional/basic/db/test_29.py similarity index 100% rename from tests/functional/basic/db/29_test.py rename to tests/functional/basic/db/test_29.py diff --git a/tests/functional/basic/db/30_test.py b/tests/functional/basic/db/test_30.py similarity index 100% rename from tests/functional/basic/db/30_test.py rename to tests/functional/basic/db/test_30.py diff --git a/tests/functional/basic/db/31_test.py b/tests/functional/basic/db/test_31.py similarity index 100% rename from tests/functional/basic/db/31_test.py rename to tests/functional/basic/db/test_31.py diff --git a/tests/functional/basic/db/32_test.py b/tests/functional/basic/db/test_32.py similarity index 100% rename from tests/functional/basic/db/32_test.py rename to tests/functional/basic/db/test_32.py diff --git a/tests/functional/basic/isql/00_test.py b/tests/functional/basic/isql/test_00.py similarity index 100% rename from tests/functional/basic/isql/00_test.py rename to tests/functional/basic/isql/test_00.py diff --git a/tests/functional/basic/isql/01_test.py b/tests/functional/basic/isql/test_01.py similarity index 100% rename from tests/functional/basic/isql/01_test.py rename to tests/functional/basic/isql/test_01.py diff --git a/tests/functional/basic/isql/02_test.py b/tests/functional/basic/isql/test_02.py similarity index 100% rename from tests/functional/basic/isql/02_test.py rename to tests/functional/basic/isql/test_02.py diff --git a/tests/functional/basic/isql/03_test.py b/tests/functional/basic/isql/test_03.py similarity index 100% rename from tests/functional/basic/isql/03_test.py rename to tests/functional/basic/isql/test_03.py diff --git a/tests/functional/basic/isql/05_test.py b/tests/functional/basic/isql/test_05.py similarity index 100% rename from tests/functional/basic/isql/05_test.py rename to tests/functional/basic/isql/test_05.py diff --git a/tests/functional/database/alter/01_test.py b/tests/functional/database/alter/test_01.py similarity index 100% rename from tests/functional/database/alter/01_test.py rename to tests/functional/database/alter/test_01.py diff --git a/tests/functional/database/alter/02_test.py b/tests/functional/database/alter/test_02.py similarity index 100% rename from tests/functional/database/alter/02_test.py rename to tests/functional/database/alter/test_02.py diff --git a/tests/functional/database/alter/03_test.py b/tests/functional/database/alter/test_03.py similarity index 100% rename from tests/functional/database/alter/03_test.py rename to tests/functional/database/alter/test_03.py diff --git a/tests/functional/database/create/01_test.py b/tests/functional/database/create/test_01.py similarity index 100% rename from tests/functional/database/create/01_test.py rename to tests/functional/database/create/test_01.py diff --git a/tests/functional/database/create/02_test.py b/tests/functional/database/create/test_02.py similarity index 100% rename from tests/functional/database/create/02_test.py rename to tests/functional/database/create/test_02.py diff --git a/tests/functional/database/create/03_test.py b/tests/functional/database/create/test_03.py similarity index 100% rename from tests/functional/database/create/03_test.py rename to tests/functional/database/create/test_03.py diff --git a/tests/functional/database/create/04_test.py b/tests/functional/database/create/test_04.py similarity index 100% rename from tests/functional/database/create/04_test.py rename to tests/functional/database/create/test_04.py diff --git a/tests/functional/database/create/05_test.py b/tests/functional/database/create/test_05.py similarity index 100% rename from tests/functional/database/create/05_test.py rename to tests/functional/database/create/test_05.py diff --git a/tests/functional/database/create/06_test.py b/tests/functional/database/create/test_06.py similarity index 100% rename from tests/functional/database/create/06_test.py rename to tests/functional/database/create/test_06.py diff --git a/tests/functional/database/create/07_test.py b/tests/functional/database/create/test_07.py similarity index 100% rename from tests/functional/database/create/07_test.py rename to tests/functional/database/create/test_07.py diff --git a/tests/functional/database/create/08_test.py b/tests/functional/database/create/test_08.py similarity index 100% rename from tests/functional/database/create/08_test.py rename to tests/functional/database/create/test_08.py diff --git a/tests/functional/database/create/09_test.py b/tests/functional/database/create/test_09.py similarity index 100% rename from tests/functional/database/create/09_test.py rename to tests/functional/database/create/test_09.py diff --git a/tests/functional/database/create/10_test.py b/tests/functional/database/create/test_10.py similarity index 100% rename from tests/functional/database/create/10_test.py rename to tests/functional/database/create/test_10.py diff --git a/tests/functional/database/create/11_test.py b/tests/functional/database/create/test_11.py similarity index 100% rename from tests/functional/database/create/11_test.py rename to tests/functional/database/create/test_11.py diff --git a/tests/functional/datatypes/decfloat_binding_to_legacy_test.py b/tests/functional/datatypes/test_decfloat_binding_to_legacy.py similarity index 100% rename from tests/functional/datatypes/decfloat_binding_to_legacy_test.py rename to tests/functional/datatypes/test_decfloat_binding_to_legacy.py diff --git a/tests/functional/datatypes/decfloat_binding_to_other_types_test.py b/tests/functional/datatypes/test_decfloat_binding_to_other_types.py similarity index 100% rename from tests/functional/datatypes/decfloat_binding_to_other_types_test.py rename to tests/functional/datatypes/test_decfloat_binding_to_other_types.py diff --git a/tests/functional/datatypes/decfloat_boundary_values_test.py b/tests/functional/datatypes/test_decfloat_boundary_values.py similarity index 100% rename from tests/functional/datatypes/decfloat_boundary_values_test.py rename to tests/functional/datatypes/test_decfloat_boundary_values.py diff --git a/tests/functional/datatypes/decfloat_columns_handlng_test.py b/tests/functional/datatypes/test_decfloat_columns_handlng.py similarity index 100% rename from tests/functional/datatypes/decfloat_columns_handlng_test.py rename to tests/functional/datatypes/test_decfloat_columns_handlng.py diff --git a/tests/functional/datatypes/decfloat_ddl_indices_test.py b/tests/functional/datatypes/test_decfloat_ddl_indices.py similarity index 100% rename from tests/functional/datatypes/decfloat_ddl_indices_test.py rename to tests/functional/datatypes/test_decfloat_ddl_indices.py diff --git a/tests/functional/datatypes/decfloat_df16_alignment_test.py b/tests/functional/datatypes/test_decfloat_df16_alignment.py similarity index 100% rename from tests/functional/datatypes/decfloat_df16_alignment_test.py rename to tests/functional/datatypes/test_decfloat_df16_alignment.py diff --git a/tests/functional/datatypes/decfloat_exceptions_trapping_test.py b/tests/functional/datatypes/test_decfloat_exceptions_trapping.py similarity index 100% rename from tests/functional/datatypes/decfloat_exceptions_trapping_test.py rename to tests/functional/datatypes/test_decfloat_exceptions_trapping.py diff --git a/tests/functional/datatypes/decfloat_literal_interpr_test.py b/tests/functional/datatypes/test_decfloat_literal_interpr.py similarity index 100% rename from tests/functional/datatypes/decfloat_literal_interpr_test.py rename to tests/functional/datatypes/test_decfloat_literal_interpr.py diff --git a/tests/functional/datatypes/decfloat_literal_length_test.py b/tests/functional/datatypes/test_decfloat_literal_length.py similarity index 100% rename from tests/functional/datatypes/decfloat_literal_length_test.py rename to tests/functional/datatypes/test_decfloat_literal_length.py diff --git a/tests/functional/datatypes/decfloat_loose_accuracy_test.py b/tests/functional/datatypes/test_decfloat_loose_accuracy.py similarity index 100% rename from tests/functional/datatypes/decfloat_loose_accuracy_test.py rename to tests/functional/datatypes/test_decfloat_loose_accuracy.py diff --git a/tests/functional/datatypes/decfloat_min_distinguish_test.py b/tests/functional/datatypes/test_decfloat_min_distinguish.py similarity index 100% rename from tests/functional/datatypes/decfloat_min_distinguish_test.py rename to tests/functional/datatypes/test_decfloat_min_distinguish.py diff --git a/tests/functional/datatypes/decfloat_nan_and_infinity_comparison_test.py b/tests/functional/datatypes/test_decfloat_nan_and_infinity_comparison.py similarity index 100% rename from tests/functional/datatypes/decfloat_nan_and_infinity_comparison_test.py rename to tests/functional/datatypes/test_decfloat_nan_and_infinity_comparison.py diff --git a/tests/functional/datatypes/decfloat_parsing_scaled_integers_and_bigint_max_min_test.py b/tests/functional/datatypes/test_decfloat_parsing_scaled_integers_and_bigint_max_min.py similarity index 100% rename from tests/functional/datatypes/decfloat_parsing_scaled_integers_and_bigint_max_min_test.py rename to tests/functional/datatypes/test_decfloat_parsing_scaled_integers_and_bigint_max_min.py diff --git a/tests/functional/datatypes/decfloat_round_modes_test.py b/tests/functional/datatypes/test_decfloat_round_modes.py similarity index 100% rename from tests/functional/datatypes/decfloat_round_modes_test.py rename to tests/functional/datatypes/test_decfloat_round_modes.py diff --git a/tests/functional/datatypes/decfloat_scalar_functions_test.py b/tests/functional/datatypes/test_decfloat_scalar_functions.py similarity index 100% rename from tests/functional/datatypes/decfloat_scalar_functions_test.py rename to tests/functional/datatypes/test_decfloat_scalar_functions.py diff --git a/tests/functional/datatypes/decfloat_single_bit_in_representation_test.py b/tests/functional/datatypes/test_decfloat_single_bit_in_representation.py similarity index 100% rename from tests/functional/datatypes/decfloat_single_bit_in_representation_test.py rename to tests/functional/datatypes/test_decfloat_single_bit_in_representation.py diff --git a/tests/functional/datatypes/decfloat_special_functions_test.py b/tests/functional/datatypes/test_decfloat_special_functions.py similarity index 100% rename from tests/functional/datatypes/decfloat_special_functions_test.py rename to tests/functional/datatypes/test_decfloat_special_functions.py diff --git a/tests/functional/datatypes/decimal_declared_scale_test.py b/tests/functional/datatypes/test_decimal_declared_scale.py similarity index 100% rename from tests/functional/datatypes/decimal_declared_scale_test.py rename to tests/functional/datatypes/test_decimal_declared_scale.py diff --git a/tests/functional/datatypes/dp_single_bit_in_representation_test.py b/tests/functional/datatypes/test_dp_single_bit_in_representation.py similarity index 100% rename from tests/functional/datatypes/dp_single_bit_in_representation_test.py rename to tests/functional/datatypes/test_dp_single_bit_in_representation.py diff --git a/tests/functional/datatypes/int128_binary_operations_test.py b/tests/functional/datatypes/test_int128_binary_operations.py similarity index 100% rename from tests/functional/datatypes/int128_binary_operations_test.py rename to tests/functional/datatypes/test_int128_binary_operations.py diff --git a/tests/functional/datatypes/int128_math_functions_test.py b/tests/functional/datatypes/test_int128_math_functions.py similarity index 100% rename from tests/functional/datatypes/int128_math_functions_test.py rename to tests/functional/datatypes/test_int128_math_functions.py diff --git a/tests/functional/dml/cte/01_test.py b/tests/functional/dml/cte/test_01.py similarity index 100% rename from tests/functional/dml/cte/01_test.py rename to tests/functional/dml/cte/test_01.py diff --git a/tests/functional/dml/cte/02_test.py b/tests/functional/dml/cte/test_02.py similarity index 100% rename from tests/functional/dml/cte/02_test.py rename to tests/functional/dml/cte/test_02.py diff --git a/tests/functional/dml/delete/01_test.py b/tests/functional/dml/delete/test_01.py similarity index 100% rename from tests/functional/dml/delete/01_test.py rename to tests/functional/dml/delete/test_01.py diff --git a/tests/functional/dml/delete/02_test.py b/tests/functional/dml/delete/test_02.py similarity index 100% rename from tests/functional/dml/delete/02_test.py rename to tests/functional/dml/delete/test_02.py diff --git a/tests/functional/dml/delete/03_test.py b/tests/functional/dml/delete/test_03.py similarity index 100% rename from tests/functional/dml/delete/03_test.py rename to tests/functional/dml/delete/test_03.py diff --git a/tests/functional/dml/insert/01_test.py b/tests/functional/dml/insert/test_01.py similarity index 100% rename from tests/functional/dml/insert/01_test.py rename to tests/functional/dml/insert/test_01.py diff --git a/tests/functional/dml/join/01_test.py b/tests/functional/dml/join/test_01.py similarity index 100% rename from tests/functional/dml/join/01_test.py rename to tests/functional/dml/join/test_01.py diff --git a/tests/functional/dml/join/02_test.py b/tests/functional/dml/join/test_02.py similarity index 100% rename from tests/functional/dml/join/02_test.py rename to tests/functional/dml/join/test_02.py diff --git a/tests/functional/dml/merge/01_test.py b/tests/functional/dml/merge/test_01.py similarity index 100% rename from tests/functional/dml/merge/01_test.py rename to tests/functional/dml/merge/test_01.py diff --git a/tests/functional/dml/merge/02_test.py b/tests/functional/dml/merge/test_02.py similarity index 100% rename from tests/functional/dml/merge/02_test.py rename to tests/functional/dml/merge/test_02.py diff --git a/tests/functional/dml/merge/03_test.py b/tests/functional/dml/merge/test_03.py similarity index 100% rename from tests/functional/dml/merge/03_test.py rename to tests/functional/dml/merge/test_03.py diff --git a/tests/functional/dml/update_or_insert/01_test.py b/tests/functional/dml/update_or_insert/test_01.py similarity index 100% rename from tests/functional/dml/update_or_insert/01_test.py rename to tests/functional/dml/update_or_insert/test_01.py diff --git a/tests/functional/dml/update_or_insert/02_test.py b/tests/functional/dml/update_or_insert/test_02.py similarity index 100% rename from tests/functional/dml/update_or_insert/02_test.py rename to tests/functional/dml/update_or_insert/test_02.py diff --git a/tests/functional/dml/update_or_insert/03_test.py b/tests/functional/dml/update_or_insert/test_03.py similarity index 100% rename from tests/functional/dml/update_or_insert/03_test.py rename to tests/functional/dml/update_or_insert/test_03.py diff --git a/tests/functional/domain/alter/01_test.py b/tests/functional/domain/alter/test_01.py similarity index 100% rename from tests/functional/domain/alter/01_test.py rename to tests/functional/domain/alter/test_01.py diff --git a/tests/functional/domain/alter/02_test.py b/tests/functional/domain/alter/test_02.py similarity index 100% rename from tests/functional/domain/alter/02_test.py rename to tests/functional/domain/alter/test_02.py diff --git a/tests/functional/domain/alter/03_test.py b/tests/functional/domain/alter/test_03.py similarity index 100% rename from tests/functional/domain/alter/03_test.py rename to tests/functional/domain/alter/test_03.py diff --git a/tests/functional/domain/alter/04_test.py b/tests/functional/domain/alter/test_04.py similarity index 100% rename from tests/functional/domain/alter/04_test.py rename to tests/functional/domain/alter/test_04.py diff --git a/tests/functional/domain/alter/05_test.py b/tests/functional/domain/alter/test_05.py similarity index 100% rename from tests/functional/domain/alter/05_test.py rename to tests/functional/domain/alter/test_05.py diff --git a/tests/functional/domain/create/01_test.py b/tests/functional/domain/create/test_01.py similarity index 100% rename from tests/functional/domain/create/01_test.py rename to tests/functional/domain/create/test_01.py diff --git a/tests/functional/domain/create/02_test.py b/tests/functional/domain/create/test_02.py similarity index 100% rename from tests/functional/domain/create/02_test.py rename to tests/functional/domain/create/test_02.py diff --git a/tests/functional/domain/create/03_test.py b/tests/functional/domain/create/test_03.py similarity index 100% rename from tests/functional/domain/create/03_test.py rename to tests/functional/domain/create/test_03.py diff --git a/tests/functional/domain/create/04_test.py b/tests/functional/domain/create/test_04.py similarity index 100% rename from tests/functional/domain/create/04_test.py rename to tests/functional/domain/create/test_04.py diff --git a/tests/functional/domain/create/05_test.py b/tests/functional/domain/create/test_05.py similarity index 100% rename from tests/functional/domain/create/05_test.py rename to tests/functional/domain/create/test_05.py diff --git a/tests/functional/domain/create/06_test.py b/tests/functional/domain/create/test_06.py similarity index 100% rename from tests/functional/domain/create/06_test.py rename to tests/functional/domain/create/test_06.py diff --git a/tests/functional/domain/create/07_test.py b/tests/functional/domain/create/test_07.py similarity index 100% rename from tests/functional/domain/create/07_test.py rename to tests/functional/domain/create/test_07.py diff --git a/tests/functional/domain/create/08_test.py b/tests/functional/domain/create/test_08.py similarity index 100% rename from tests/functional/domain/create/08_test.py rename to tests/functional/domain/create/test_08.py diff --git a/tests/functional/domain/create/09_test.py b/tests/functional/domain/create/test_09.py similarity index 100% rename from tests/functional/domain/create/09_test.py rename to tests/functional/domain/create/test_09.py diff --git a/tests/functional/domain/create/10_test.py b/tests/functional/domain/create/test_10.py similarity index 100% rename from tests/functional/domain/create/10_test.py rename to tests/functional/domain/create/test_10.py diff --git a/tests/functional/domain/create/11_test.py b/tests/functional/domain/create/test_11.py similarity index 100% rename from tests/functional/domain/create/11_test.py rename to tests/functional/domain/create/test_11.py diff --git a/tests/functional/domain/create/12_test.py b/tests/functional/domain/create/test_12.py similarity index 100% rename from tests/functional/domain/create/12_test.py rename to tests/functional/domain/create/test_12.py diff --git a/tests/functional/domain/create/13_test.py b/tests/functional/domain/create/test_13.py similarity index 100% rename from tests/functional/domain/create/13_test.py rename to tests/functional/domain/create/test_13.py diff --git a/tests/functional/domain/create/14_test.py b/tests/functional/domain/create/test_14.py similarity index 100% rename from tests/functional/domain/create/14_test.py rename to tests/functional/domain/create/test_14.py diff --git a/tests/functional/domain/create/15_test.py b/tests/functional/domain/create/test_15.py similarity index 100% rename from tests/functional/domain/create/15_test.py rename to tests/functional/domain/create/test_15.py diff --git a/tests/functional/domain/create/16_test.py b/tests/functional/domain/create/test_16.py similarity index 100% rename from tests/functional/domain/create/16_test.py rename to tests/functional/domain/create/test_16.py diff --git a/tests/functional/domain/create/17_test.py b/tests/functional/domain/create/test_17.py similarity index 100% rename from tests/functional/domain/create/17_test.py rename to tests/functional/domain/create/test_17.py diff --git a/tests/functional/domain/create/18_test.py b/tests/functional/domain/create/test_18.py similarity index 100% rename from tests/functional/domain/create/18_test.py rename to tests/functional/domain/create/test_18.py diff --git a/tests/functional/domain/create/19_test.py b/tests/functional/domain/create/test_19.py similarity index 100% rename from tests/functional/domain/create/19_test.py rename to tests/functional/domain/create/test_19.py diff --git a/tests/functional/domain/create/20_test.py b/tests/functional/domain/create/test_20.py similarity index 100% rename from tests/functional/domain/create/20_test.py rename to tests/functional/domain/create/test_20.py diff --git a/tests/functional/domain/create/21_test.py b/tests/functional/domain/create/test_21.py similarity index 100% rename from tests/functional/domain/create/21_test.py rename to tests/functional/domain/create/test_21.py diff --git a/tests/functional/domain/create/22_test.py b/tests/functional/domain/create/test_22.py similarity index 100% rename from tests/functional/domain/create/22_test.py rename to tests/functional/domain/create/test_22.py diff --git a/tests/functional/domain/create/23_test.py b/tests/functional/domain/create/test_23.py similarity index 100% rename from tests/functional/domain/create/23_test.py rename to tests/functional/domain/create/test_23.py diff --git a/tests/functional/domain/create/24_test.py b/tests/functional/domain/create/test_24.py similarity index 100% rename from tests/functional/domain/create/24_test.py rename to tests/functional/domain/create/test_24.py diff --git a/tests/functional/domain/create/25_test.py b/tests/functional/domain/create/test_25.py similarity index 100% rename from tests/functional/domain/create/25_test.py rename to tests/functional/domain/create/test_25.py diff --git a/tests/functional/domain/create/26_test.py b/tests/functional/domain/create/test_26.py similarity index 100% rename from tests/functional/domain/create/26_test.py rename to tests/functional/domain/create/test_26.py diff --git a/tests/functional/domain/create/27_test.py b/tests/functional/domain/create/test_27.py similarity index 100% rename from tests/functional/domain/create/27_test.py rename to tests/functional/domain/create/test_27.py diff --git a/tests/functional/domain/create/28_test.py b/tests/functional/domain/create/test_28.py similarity index 100% rename from tests/functional/domain/create/28_test.py rename to tests/functional/domain/create/test_28.py diff --git a/tests/functional/domain/create/29_test.py b/tests/functional/domain/create/test_29.py similarity index 100% rename from tests/functional/domain/create/29_test.py rename to tests/functional/domain/create/test_29.py diff --git a/tests/functional/domain/create/30_test.py b/tests/functional/domain/create/test_30.py similarity index 100% rename from tests/functional/domain/create/30_test.py rename to tests/functional/domain/create/test_30.py diff --git a/tests/functional/domain/create/31_test.py b/tests/functional/domain/create/test_31.py similarity index 100% rename from tests/functional/domain/create/31_test.py rename to tests/functional/domain/create/test_31.py diff --git a/tests/functional/domain/create/32_test.py b/tests/functional/domain/create/test_32.py similarity index 100% rename from tests/functional/domain/create/32_test.py rename to tests/functional/domain/create/test_32.py diff --git a/tests/functional/domain/create/33_test.py b/tests/functional/domain/create/test_33.py similarity index 100% rename from tests/functional/domain/create/33_test.py rename to tests/functional/domain/create/test_33.py diff --git a/tests/functional/domain/create/34_test.py b/tests/functional/domain/create/test_34.py similarity index 100% rename from tests/functional/domain/create/34_test.py rename to tests/functional/domain/create/test_34.py diff --git a/tests/functional/domain/create/35_test.py b/tests/functional/domain/create/test_35.py similarity index 100% rename from tests/functional/domain/create/35_test.py rename to tests/functional/domain/create/test_35.py diff --git a/tests/functional/domain/create/36_test.py b/tests/functional/domain/create/test_36.py similarity index 100% rename from tests/functional/domain/create/36_test.py rename to tests/functional/domain/create/test_36.py diff --git a/tests/functional/domain/create/37_test.py b/tests/functional/domain/create/test_37.py similarity index 100% rename from tests/functional/domain/create/37_test.py rename to tests/functional/domain/create/test_37.py diff --git a/tests/functional/domain/create/38_test.py b/tests/functional/domain/create/test_38.py similarity index 100% rename from tests/functional/domain/create/38_test.py rename to tests/functional/domain/create/test_38.py diff --git a/tests/functional/domain/create/39_test.py b/tests/functional/domain/create/test_39.py similarity index 100% rename from tests/functional/domain/create/39_test.py rename to tests/functional/domain/create/test_39.py diff --git a/tests/functional/domain/create/40_test.py b/tests/functional/domain/create/test_40.py similarity index 100% rename from tests/functional/domain/create/40_test.py rename to tests/functional/domain/create/test_40.py diff --git a/tests/functional/domain/create/41_test.py b/tests/functional/domain/create/test_41.py similarity index 100% rename from tests/functional/domain/create/41_test.py rename to tests/functional/domain/create/test_41.py diff --git a/tests/functional/domain/create/42_test.py b/tests/functional/domain/create/test_42.py similarity index 100% rename from tests/functional/domain/create/42_test.py rename to tests/functional/domain/create/test_42.py diff --git a/tests/functional/domain/create/54_test.py b/tests/functional/domain/create/test_54.py similarity index 100% rename from tests/functional/domain/create/54_test.py rename to tests/functional/domain/create/test_54.py diff --git a/tests/functional/domain/drop/01_test.py b/tests/functional/domain/drop/test_01.py similarity index 100% rename from tests/functional/domain/drop/01_test.py rename to tests/functional/domain/drop/test_01.py diff --git a/tests/functional/domain/drop/02_test.py b/tests/functional/domain/drop/test_02.py similarity index 100% rename from tests/functional/domain/drop/02_test.py rename to tests/functional/domain/drop/test_02.py diff --git a/tests/functional/domain/drop/03_test.py b/tests/functional/domain/drop/test_03.py similarity index 100% rename from tests/functional/domain/drop/03_test.py rename to tests/functional/domain/drop/test_03.py diff --git a/tests/functional/exception/alter/01_test.py b/tests/functional/exception/alter/test_01.py similarity index 100% rename from tests/functional/exception/alter/01_test.py rename to tests/functional/exception/alter/test_01.py diff --git a/tests/functional/exception/create/01_test.py b/tests/functional/exception/create/test_01.py similarity index 100% rename from tests/functional/exception/create/01_test.py rename to tests/functional/exception/create/test_01.py diff --git a/tests/functional/exception/create/02_test.py b/tests/functional/exception/create/test_02.py similarity index 100% rename from tests/functional/exception/create/02_test.py rename to tests/functional/exception/create/test_02.py diff --git a/tests/functional/exception/create/03_test.py b/tests/functional/exception/create/test_03.py similarity index 100% rename from tests/functional/exception/create/03_test.py rename to tests/functional/exception/create/test_03.py diff --git a/tests/functional/exception/drop/01_test.py b/tests/functional/exception/drop/test_01.py similarity index 100% rename from tests/functional/exception/drop/01_test.py rename to tests/functional/exception/drop/test_01.py diff --git a/tests/functional/exception/drop/02_test.py b/tests/functional/exception/drop/test_02.py similarity index 100% rename from tests/functional/exception/drop/02_test.py rename to tests/functional/exception/drop/test_02.py diff --git a/tests/functional/exception/drop/03_test.py b/tests/functional/exception/drop/test_03.py similarity index 100% rename from tests/functional/exception/drop/03_test.py rename to tests/functional/exception/drop/test_03.py diff --git a/tests/functional/exception/handling_name_and_message_test.py b/tests/functional/exception/test_handling_name_and_message.py similarity index 100% rename from tests/functional/exception/handling_name_and_message_test.py rename to tests/functional/exception/test_handling_name_and_message.py diff --git a/tests/functional/fkey/primary/insert_pk_01_test.py b/tests/functional/fkey/primary/test_insert_pk_01.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_01_test.py rename to tests/functional/fkey/primary/test_insert_pk_01.py diff --git a/tests/functional/fkey/primary/insert_pk_02_test.py b/tests/functional/fkey/primary/test_insert_pk_02.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_02_test.py rename to tests/functional/fkey/primary/test_insert_pk_02.py diff --git a/tests/functional/fkey/primary/insert_pk_03_test.py b/tests/functional/fkey/primary/test_insert_pk_03.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_03_test.py rename to tests/functional/fkey/primary/test_insert_pk_03.py diff --git a/tests/functional/fkey/primary/insert_pk_04_test.py b/tests/functional/fkey/primary/test_insert_pk_04.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_04_test.py rename to tests/functional/fkey/primary/test_insert_pk_04.py diff --git a/tests/functional/fkey/primary/insert_pk_05_test.py b/tests/functional/fkey/primary/test_insert_pk_05.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_05_test.py rename to tests/functional/fkey/primary/test_insert_pk_05.py diff --git a/tests/functional/fkey/primary/insert_pk_06_test.py b/tests/functional/fkey/primary/test_insert_pk_06.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_06_test.py rename to tests/functional/fkey/primary/test_insert_pk_06.py diff --git a/tests/functional/fkey/primary/insert_pk_07_test.py b/tests/functional/fkey/primary/test_insert_pk_07.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_07_test.py rename to tests/functional/fkey/primary/test_insert_pk_07.py diff --git a/tests/functional/fkey/primary/insert_pk_08_test.py b/tests/functional/fkey/primary/test_insert_pk_08.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_08_test.py rename to tests/functional/fkey/primary/test_insert_pk_08.py diff --git a/tests/functional/fkey/primary/insert_pk_09_test.py b/tests/functional/fkey/primary/test_insert_pk_09.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_09_test.py rename to tests/functional/fkey/primary/test_insert_pk_09.py diff --git a/tests/functional/fkey/primary/insert_pk_10_test.py b/tests/functional/fkey/primary/test_insert_pk_10.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_10_test.py rename to tests/functional/fkey/primary/test_insert_pk_10.py diff --git a/tests/functional/fkey/primary/insert_pk_11_test.py b/tests/functional/fkey/primary/test_insert_pk_11.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_11_test.py rename to tests/functional/fkey/primary/test_insert_pk_11.py diff --git a/tests/functional/fkey/primary/insert_pk_12_test.py b/tests/functional/fkey/primary/test_insert_pk_12.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_12_test.py rename to tests/functional/fkey/primary/test_insert_pk_12.py diff --git a/tests/functional/fkey/primary/insert_pk_13_test.py b/tests/functional/fkey/primary/test_insert_pk_13.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_13_test.py rename to tests/functional/fkey/primary/test_insert_pk_13.py diff --git a/tests/functional/fkey/primary/insert_pk_14_test.py b/tests/functional/fkey/primary/test_insert_pk_14.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_14_test.py rename to tests/functional/fkey/primary/test_insert_pk_14.py diff --git a/tests/functional/fkey/primary/insert_pk_15_test.py b/tests/functional/fkey/primary/test_insert_pk_15.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_15_test.py rename to tests/functional/fkey/primary/test_insert_pk_15.py diff --git a/tests/functional/fkey/primary/insert_pk_16_test.py b/tests/functional/fkey/primary/test_insert_pk_16.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_16_test.py rename to tests/functional/fkey/primary/test_insert_pk_16.py diff --git a/tests/functional/fkey/primary/insert_pk_17_test.py b/tests/functional/fkey/primary/test_insert_pk_17.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_17_test.py rename to tests/functional/fkey/primary/test_insert_pk_17.py diff --git a/tests/functional/fkey/primary/insert_pk_18_test.py b/tests/functional/fkey/primary/test_insert_pk_18.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_18_test.py rename to tests/functional/fkey/primary/test_insert_pk_18.py diff --git a/tests/functional/fkey/primary/insert_pk_19_test.py b/tests/functional/fkey/primary/test_insert_pk_19.py similarity index 100% rename from tests/functional/fkey/primary/insert_pk_19_test.py rename to tests/functional/fkey/primary/test_insert_pk_19.py diff --git a/tests/functional/fkey/primary/select_pk_01_test.py b/tests/functional/fkey/primary/test_select_pk_01.py similarity index 100% rename from tests/functional/fkey/primary/select_pk_01_test.py rename to tests/functional/fkey/primary/test_select_pk_01.py diff --git a/tests/functional/fkey/primary/select_pk_02_test.py b/tests/functional/fkey/primary/test_select_pk_02.py similarity index 100% rename from tests/functional/fkey/primary/select_pk_02_test.py rename to tests/functional/fkey/primary/test_select_pk_02.py diff --git a/tests/functional/fkey/primary/upd_pk_01_test.py b/tests/functional/fkey/primary/test_upd_pk_01.py similarity index 100% rename from tests/functional/fkey/primary/upd_pk_01_test.py rename to tests/functional/fkey/primary/test_upd_pk_01.py diff --git a/tests/functional/fkey/primary/upd_pk_02_test.py b/tests/functional/fkey/primary/test_upd_pk_02.py similarity index 100% rename from tests/functional/fkey/primary/upd_pk_02_test.py rename to tests/functional/fkey/primary/test_upd_pk_02.py diff --git a/tests/functional/fkey/unique/insert_01_test.py b/tests/functional/fkey/unique/test_insert_01.py similarity index 100% rename from tests/functional/fkey/unique/insert_01_test.py rename to tests/functional/fkey/unique/test_insert_01.py diff --git a/tests/functional/fkey/unique/insert_02_test.py b/tests/functional/fkey/unique/test_insert_02.py similarity index 100% rename from tests/functional/fkey/unique/insert_02_test.py rename to tests/functional/fkey/unique/test_insert_02.py diff --git a/tests/functional/fkey/unique/insert_03_test.py b/tests/functional/fkey/unique/test_insert_03.py similarity index 100% rename from tests/functional/fkey/unique/insert_03_test.py rename to tests/functional/fkey/unique/test_insert_03.py diff --git a/tests/functional/fkey/unique/insert_04_test.py b/tests/functional/fkey/unique/test_insert_04.py similarity index 100% rename from tests/functional/fkey/unique/insert_04_test.py rename to tests/functional/fkey/unique/test_insert_04.py diff --git a/tests/functional/fkey/unique/insert_05_test.py b/tests/functional/fkey/unique/test_insert_05.py similarity index 100% rename from tests/functional/fkey/unique/insert_05_test.py rename to tests/functional/fkey/unique/test_insert_05.py diff --git a/tests/functional/fkey/unique/insert_06_test.py b/tests/functional/fkey/unique/test_insert_06.py similarity index 100% rename from tests/functional/fkey/unique/insert_06_test.py rename to tests/functional/fkey/unique/test_insert_06.py diff --git a/tests/functional/fkey/unique/insert_07_test.py b/tests/functional/fkey/unique/test_insert_07.py similarity index 100% rename from tests/functional/fkey/unique/insert_07_test.py rename to tests/functional/fkey/unique/test_insert_07.py diff --git a/tests/functional/fkey/unique/insert_08_test.py b/tests/functional/fkey/unique/test_insert_08.py similarity index 100% rename from tests/functional/fkey/unique/insert_08_test.py rename to tests/functional/fkey/unique/test_insert_08.py diff --git a/tests/functional/fkey/unique/insert_09_test.py b/tests/functional/fkey/unique/test_insert_09.py similarity index 100% rename from tests/functional/fkey/unique/insert_09_test.py rename to tests/functional/fkey/unique/test_insert_09.py diff --git a/tests/functional/fkey/unique/insert_11_test.py b/tests/functional/fkey/unique/test_insert_11.py similarity index 100% rename from tests/functional/fkey/unique/insert_11_test.py rename to tests/functional/fkey/unique/test_insert_11.py diff --git a/tests/functional/fkey/unique/insert_12_test.py b/tests/functional/fkey/unique/test_insert_12.py similarity index 100% rename from tests/functional/fkey/unique/insert_12_test.py rename to tests/functional/fkey/unique/test_insert_12.py diff --git a/tests/functional/fkey/unique/insert_13_test.py b/tests/functional/fkey/unique/test_insert_13.py similarity index 100% rename from tests/functional/fkey/unique/insert_13_test.py rename to tests/functional/fkey/unique/test_insert_13.py diff --git a/tests/functional/fkey/unique/insert_14_test.py b/tests/functional/fkey/unique/test_insert_14.py similarity index 100% rename from tests/functional/fkey/unique/insert_14_test.py rename to tests/functional/fkey/unique/test_insert_14.py diff --git a/tests/functional/fkey/unique/select_uf_01_test.py b/tests/functional/fkey/unique/test_select_uf_01.py similarity index 100% rename from tests/functional/fkey/unique/select_uf_01_test.py rename to tests/functional/fkey/unique/test_select_uf_01.py diff --git a/tests/functional/fkey/unique/select_uf_02_test.py b/tests/functional/fkey/unique/test_select_uf_02.py similarity index 100% rename from tests/functional/fkey/unique/select_uf_02_test.py rename to tests/functional/fkey/unique/test_select_uf_02.py diff --git a/tests/functional/fkey/unique/upd_01_test.py b/tests/functional/fkey/unique/test_upd_01.py similarity index 100% rename from tests/functional/fkey/unique/upd_01_test.py rename to tests/functional/fkey/unique/test_upd_01.py diff --git a/tests/functional/fkey/unique/upd_02_test.py b/tests/functional/fkey/unique/test_upd_02.py similarity index 100% rename from tests/functional/fkey/unique/upd_02_test.py rename to tests/functional/fkey/unique/test_upd_02.py diff --git a/tests/functional/generator/alter/01_test.py b/tests/functional/generator/alter/test_01.py similarity index 100% rename from tests/functional/generator/alter/01_test.py rename to tests/functional/generator/alter/test_01.py diff --git a/tests/functional/generator/create/01_test.py b/tests/functional/generator/create/test_01.py similarity index 100% rename from tests/functional/generator/create/01_test.py rename to tests/functional/generator/create/test_01.py diff --git a/tests/functional/generator/create/02_test.py b/tests/functional/generator/create/test_02.py similarity index 100% rename from tests/functional/generator/create/02_test.py rename to tests/functional/generator/create/test_02.py diff --git a/tests/functional/generator/drop/01_test.py b/tests/functional/generator/drop/test_01.py similarity index 100% rename from tests/functional/generator/drop/01_test.py rename to tests/functional/generator/drop/test_01.py diff --git a/tests/functional/generator/drop/02_test.py b/tests/functional/generator/drop/test_02.py similarity index 100% rename from tests/functional/generator/drop/02_test.py rename to tests/functional/generator/drop/test_02.py diff --git a/tests/functional/generator/drop/03_test.py b/tests/functional/generator/drop/test_03.py similarity index 100% rename from tests/functional/generator/drop/03_test.py rename to tests/functional/generator/drop/test_03.py diff --git a/tests/functional/gtcs/computed_fields_01_test.py b/tests/functional/gtcs/test_computed_fields_01.py similarity index 100% rename from tests/functional/gtcs/computed_fields_01_test.py rename to tests/functional/gtcs/test_computed_fields_01.py diff --git a/tests/functional/gtcs/computed_fields_02_test.py b/tests/functional/gtcs/test_computed_fields_02.py similarity index 100% rename from tests/functional/gtcs/computed_fields_02_test.py rename to tests/functional/gtcs/test_computed_fields_02.py diff --git a/tests/functional/gtcs/computed_fields_03_test.py b/tests/functional/gtcs/test_computed_fields_03.py similarity index 100% rename from tests/functional/gtcs/computed_fields_03_test.py rename to tests/functional/gtcs/test_computed_fields_03.py diff --git a/tests/functional/gtcs/computed_fields_04_test.py b/tests/functional/gtcs/test_computed_fields_04.py similarity index 100% rename from tests/functional/gtcs/computed_fields_04_test.py rename to tests/functional/gtcs/test_computed_fields_04.py diff --git a/tests/functional/gtcs/computed_fields_05_test.py b/tests/functional/gtcs/test_computed_fields_05.py similarity index 100% rename from tests/functional/gtcs/computed_fields_05_test.py rename to tests/functional/gtcs/test_computed_fields_05.py diff --git a/tests/functional/gtcs/computed_fields_06_test.py b/tests/functional/gtcs/test_computed_fields_06.py similarity index 100% rename from tests/functional/gtcs/computed_fields_06_test.py rename to tests/functional/gtcs/test_computed_fields_06.py diff --git a/tests/functional/gtcs/computed_fields_07_test.py b/tests/functional/gtcs/test_computed_fields_07.py similarity index 100% rename from tests/functional/gtcs/computed_fields_07_test.py rename to tests/functional/gtcs/test_computed_fields_07.py diff --git a/tests/functional/gtcs/computed_fields_08_test.py b/tests/functional/gtcs/test_computed_fields_08.py similarity index 100% rename from tests/functional/gtcs/computed_fields_08_test.py rename to tests/functional/gtcs/test_computed_fields_08.py diff --git a/tests/functional/gtcs/computed_fields_09_test.py b/tests/functional/gtcs/test_computed_fields_09.py similarity index 100% rename from tests/functional/gtcs/computed_fields_09_test.py rename to tests/functional/gtcs/test_computed_fields_09.py diff --git a/tests/functional/gtcs/computed_fields_10_test.py b/tests/functional/gtcs/test_computed_fields_10.py similarity index 100% rename from tests/functional/gtcs/computed_fields_10_test.py rename to tests/functional/gtcs/test_computed_fields_10.py diff --git a/tests/functional/gtcs/computed_fields_11_test.py b/tests/functional/gtcs/test_computed_fields_11.py similarity index 100% rename from tests/functional/gtcs/computed_fields_11_test.py rename to tests/functional/gtcs/test_computed_fields_11.py diff --git a/tests/functional/gtcs/computed_fields_12_test.py b/tests/functional/gtcs/test_computed_fields_12.py similarity index 100% rename from tests/functional/gtcs/computed_fields_12_test.py rename to tests/functional/gtcs/test_computed_fields_12.py diff --git a/tests/functional/gtcs/computed_fields_13_test.py b/tests/functional/gtcs/test_computed_fields_13.py similarity index 100% rename from tests/functional/gtcs/computed_fields_13_test.py rename to tests/functional/gtcs/test_computed_fields_13.py diff --git a/tests/functional/gtcs/computed_fields_14_test.py b/tests/functional/gtcs/test_computed_fields_14.py similarity index 100% rename from tests/functional/gtcs/computed_fields_14_test.py rename to tests/functional/gtcs/test_computed_fields_14.py diff --git a/tests/functional/gtcs/computed_fields_15_test.py b/tests/functional/gtcs/test_computed_fields_15.py similarity index 100% rename from tests/functional/gtcs/computed_fields_15_test.py rename to tests/functional/gtcs/test_computed_fields_15.py diff --git a/tests/functional/gtcs/computed_fields_16_test.py b/tests/functional/gtcs/test_computed_fields_16.py similarity index 100% rename from tests/functional/gtcs/computed_fields_16_test.py rename to tests/functional/gtcs/test_computed_fields_16.py diff --git a/tests/functional/gtcs/computed_fields_17_test.py b/tests/functional/gtcs/test_computed_fields_17.py similarity index 100% rename from tests/functional/gtcs/computed_fields_17_test.py rename to tests/functional/gtcs/test_computed_fields_17.py diff --git a/tests/functional/gtcs/conversion_error_from_string_test.py b/tests/functional/gtcs/test_conversion_error_from_string.py similarity index 100% rename from tests/functional/gtcs/conversion_error_from_string_test.py rename to tests/functional/gtcs/test_conversion_error_from_string.py diff --git a/tests/functional/gtcs/crash_of_group_by_varchar_4000_test.py b/tests/functional/gtcs/test_crash_of_group_by_varchar_4000.py similarity index 100% rename from tests/functional/gtcs/crash_of_group_by_varchar_4000_test.py rename to tests/functional/gtcs/test_crash_of_group_by_varchar_4000.py diff --git a/tests/functional/gtcs/division_by_zero_corrupts_db_test.py b/tests/functional/gtcs/test_division_by_zero_corrupts_db.py similarity index 100% rename from tests/functional/gtcs/division_by_zero_corrupts_db_test.py rename to tests/functional/gtcs/test_division_by_zero_corrupts_db.py diff --git a/tests/functional/gtcs/dsql_domain_01_test.py b/tests/functional/gtcs/test_dsql_domain_01.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_01_test.py rename to tests/functional/gtcs/test_dsql_domain_01.py diff --git a/tests/functional/gtcs/dsql_domain_02_test.py b/tests/functional/gtcs/test_dsql_domain_02.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_02_test.py rename to tests/functional/gtcs/test_dsql_domain_02.py diff --git a/tests/functional/gtcs/dsql_domain_03_test.py b/tests/functional/gtcs/test_dsql_domain_03.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_03_test.py rename to tests/functional/gtcs/test_dsql_domain_03.py diff --git a/tests/functional/gtcs/dsql_domain_04_test.py b/tests/functional/gtcs/test_dsql_domain_04.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_04_test.py rename to tests/functional/gtcs/test_dsql_domain_04.py diff --git a/tests/functional/gtcs/dsql_domain_06_test.py b/tests/functional/gtcs/test_dsql_domain_06.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_06_test.py rename to tests/functional/gtcs/test_dsql_domain_06.py diff --git a/tests/functional/gtcs/dsql_domain_07_test.py b/tests/functional/gtcs/test_dsql_domain_07.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_07_test.py rename to tests/functional/gtcs/test_dsql_domain_07.py diff --git a/tests/functional/gtcs/dsql_domain_12_test.py b/tests/functional/gtcs/test_dsql_domain_12.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_12_test.py rename to tests/functional/gtcs/test_dsql_domain_12.py diff --git a/tests/functional/gtcs/dsql_domain_13_test.py b/tests/functional/gtcs/test_dsql_domain_13.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_13_test.py rename to tests/functional/gtcs/test_dsql_domain_13.py diff --git a/tests/functional/gtcs/dsql_domain_15_test.py b/tests/functional/gtcs/test_dsql_domain_15.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_15_test.py rename to tests/functional/gtcs/test_dsql_domain_15.py diff --git a/tests/functional/gtcs/dsql_domain_20_test.py b/tests/functional/gtcs/test_dsql_domain_20.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_20_test.py rename to tests/functional/gtcs/test_dsql_domain_20.py diff --git a/tests/functional/gtcs/dsql_domain_21_test.py b/tests/functional/gtcs/test_dsql_domain_21.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_21_test.py rename to tests/functional/gtcs/test_dsql_domain_21.py diff --git a/tests/functional/gtcs/dsql_domain_22_test.py b/tests/functional/gtcs/test_dsql_domain_22.py similarity index 100% rename from tests/functional/gtcs/dsql_domain_22_test.py rename to tests/functional/gtcs/test_dsql_domain_22.py diff --git a/tests/functional/gtcs/execute_statement_within_procedure_test.py b/tests/functional/gtcs/test_execute_statement_within_procedure.py similarity index 100% rename from tests/functional/gtcs/execute_statement_within_procedure_test.py rename to tests/functional/gtcs/test_execute_statement_within_procedure.py diff --git a/tests/functional/gtcs/external_file_03_d_test.py b/tests/functional/gtcs/test_external_file_03_d.py similarity index 100% rename from tests/functional/gtcs/external_file_03_d_test.py rename to tests/functional/gtcs/test_external_file_03_d.py diff --git a/tests/functional/gtcs/external_file_04_d_test.py b/tests/functional/gtcs/test_external_file_04_d.py similarity index 100% rename from tests/functional/gtcs/external_file_04_d_test.py rename to tests/functional/gtcs/test_external_file_04_d.py diff --git a/tests/functional/gtcs/external_file_04_d_bigint_test.py b/tests/functional/gtcs/test_external_file_04_d_bigint.py similarity index 100% rename from tests/functional/gtcs/external_file_04_d_bigint_test.py rename to tests/functional/gtcs/test_external_file_04_d_bigint.py diff --git a/tests/functional/gtcs/external_file_04_d_int128_test.py b/tests/functional/gtcs/test_external_file_04_d_int128.py similarity index 100% rename from tests/functional/gtcs/external_file_04_d_int128_test.py rename to tests/functional/gtcs/test_external_file_04_d_int128.py diff --git a/tests/functional/gtcs/external_file_06_d_test.py b/tests/functional/gtcs/test_external_file_06_d.py similarity index 100% rename from tests/functional/gtcs/external_file_06_d_test.py rename to tests/functional/gtcs/test_external_file_06_d.py diff --git a/tests/functional/gtcs/external_file_09_d_test.py b/tests/functional/gtcs/test_external_file_09_d.py similarity index 100% rename from tests/functional/gtcs/external_file_09_d_test.py rename to tests/functional/gtcs/test_external_file_09_d.py diff --git a/tests/functional/gtcs/gtcs_proc_cast_isql_test.py b/tests/functional/gtcs/test_gtcs_proc_cast_isql.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_cast_isql_test.py rename to tests/functional/gtcs/test_gtcs_proc_cast_isql.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_01_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_01.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_01_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_01.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_02_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_02.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_02_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_02.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_03_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_03.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_03_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_03.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_04_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_04.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_04_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_04.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_05_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_05.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_05_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_05.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_06_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_06.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_06_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_06.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_07_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_07.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_07_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_07.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_08_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_08.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_08_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_08.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_10_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_10.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_10_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_10.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_11_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_11.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_11_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_11.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_12_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_12.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_12_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_12.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_13_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_13.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_13_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_13.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_15_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_15.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_15_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_15.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_16_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_16.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_16_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_16.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_17_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_17.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_17_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_17.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_18_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_18.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_18_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_18.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_19_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_19.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_19_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_19.py diff --git a/tests/functional/gtcs/gtcs_proc_isql_20_test.py b/tests/functional/gtcs/test_gtcs_proc_isql_20.py similarity index 100% rename from tests/functional/gtcs/gtcs_proc_isql_20_test.py rename to tests/functional/gtcs/test_gtcs_proc_isql_20.py diff --git a/tests/functional/gtcs/gtcs_select_delete_isql_test.py b/tests/functional/gtcs/test_gtcs_select_delete_isql.py similarity index 100% rename from tests/functional/gtcs/gtcs_select_delete_isql_test.py rename to tests/functional/gtcs/test_gtcs_select_delete_isql.py diff --git a/tests/functional/gtcs/invalid_stream_when_use_trim_test.py b/tests/functional/gtcs/test_invalid_stream_when_use_trim.py similarity index 100% rename from tests/functional/gtcs/invalid_stream_when_use_trim_test.py rename to tests/functional/gtcs/test_invalid_stream_when_use_trim.py diff --git a/tests/functional/gtcs/isql_show_command_ambiguity_test.py b/tests/functional/gtcs/test_isql_show_command_ambiguity.py similarity index 100% rename from tests/functional/gtcs/isql_show_command_ambiguity_test.py rename to tests/functional/gtcs/test_isql_show_command_ambiguity.py diff --git a/tests/functional/gtcs/isql_show_command_collation_test.py b/tests/functional/gtcs/test_isql_show_command_collation.py similarity index 100% rename from tests/functional/gtcs/isql_show_command_collation_test.py rename to tests/functional/gtcs/test_isql_show_command_collation.py diff --git a/tests/functional/gtcs/minimum_grant_test.py b/tests/functional/gtcs/test_minimum_grant_test.py similarity index 100% rename from tests/functional/gtcs/minimum_grant_test.py rename to tests/functional/gtcs/test_minimum_grant_test.py diff --git a/tests/functional/gtcs/parser_comments_in_sql_test.py b/tests/functional/gtcs/test_parser_comments_in_sql.py similarity index 100% rename from tests/functional/gtcs/parser_comments_in_sql_test.py rename to tests/functional/gtcs/test_parser_comments_in_sql.py diff --git a/tests/functional/gtcs/ref_integ_drop_fk_index_test.py b/tests/functional/gtcs/test_ref_integ_drop_fk_index.py similarity index 100% rename from tests/functional/gtcs/ref_integ_drop_fk_index_test.py rename to tests/functional/gtcs/test_ref_integ_drop_fk_index.py diff --git a/tests/functional/gtcs/ref_integ_drop_fk_then_pk_test.py b/tests/functional/gtcs/test_ref_integ_drop_fk_then_pk.py similarity index 100% rename from tests/functional/gtcs/ref_integ_drop_fk_then_pk_test.py rename to tests/functional/gtcs/test_ref_integ_drop_fk_then_pk.py diff --git a/tests/functional/gtcs/ref_integ_drop_pk_constraint_test.py b/tests/functional/gtcs/test_ref_integ_drop_pk_constraint.py similarity index 100% rename from tests/functional/gtcs/ref_integ_drop_pk_constraint_test.py rename to tests/functional/gtcs/test_ref_integ_drop_pk_constraint.py diff --git a/tests/functional/gtcs/ref_integ_drop_pk_index_test.py b/tests/functional/gtcs/test_ref_integ_drop_pk_index.py similarity index 100% rename from tests/functional/gtcs/ref_integ_drop_pk_index_test.py rename to tests/functional/gtcs/test_ref_integ_drop_pk_index.py diff --git a/tests/functional/gtcs/ref_integ_inactive_fk_index_test.py b/tests/functional/gtcs/test_ref_integ_inactive_fk_index.py similarity index 100% rename from tests/functional/gtcs/ref_integ_inactive_fk_index_test.py rename to tests/functional/gtcs/test_ref_integ_inactive_fk_index.py diff --git a/tests/functional/gtcs/ref_integ_inactive_pk_index_test.py b/tests/functional/gtcs/test_ref_integ_inactive_pk_index.py similarity index 100% rename from tests/functional/gtcs/ref_integ_inactive_pk_index_test.py rename to tests/functional/gtcs/test_ref_integ_inactive_pk_index.py diff --git a/tests/functional/gtcs/ref_integ_inactive_pk_index_2_test.py b/tests/functional/gtcs/test_ref_integ_inactive_pk_index_2.py similarity index 100% rename from tests/functional/gtcs/ref_integ_inactive_pk_index_2_test.py rename to tests/functional/gtcs/test_ref_integ_inactive_pk_index_2.py diff --git a/tests/functional/gtcs/regexp_similar_to_test.py b/tests/functional/gtcs/test_regexp_similar_to.py similarity index 100% rename from tests/functional/gtcs/regexp_similar_to_test.py rename to tests/functional/gtcs/test_regexp_similar_to.py diff --git a/tests/functional/gtcs/regexp_substring_similar_to_test.py b/tests/functional/gtcs/test_regexp_substring_similar_to.py similarity index 100% rename from tests/functional/gtcs/regexp_substring_similar_to_test.py rename to tests/functional/gtcs/test_regexp_substring_similar_to.py diff --git a/tests/functional/gtcs/sql_join_03_test.py b/tests/functional/gtcs/test_sql_join_03.py similarity index 100% rename from tests/functional/gtcs/sql_join_03_test.py rename to tests/functional/gtcs/test_sql_join_03.py diff --git a/tests/functional/gtcs/sql_join_04_test.py b/tests/functional/gtcs/test_sql_join_04.py similarity index 100% rename from tests/functional/gtcs/sql_join_04_test.py rename to tests/functional/gtcs/test_sql_join_04.py diff --git a/tests/functional/gtcs/time_zone_test.py b/tests/functional/gtcs/test_time_zone.py similarity index 100% rename from tests/functional/gtcs/time_zone_test.py rename to tests/functional/gtcs/test_time_zone.py diff --git a/tests/functional/gtcs/transactions_autocommit_1_test.py b/tests/functional/gtcs/test_transactions_autocommit_1.py similarity index 100% rename from tests/functional/gtcs/transactions_autocommit_1_test.py rename to tests/functional/gtcs/test_transactions_autocommit_1.py diff --git a/tests/functional/gtcs/transactions_autocommit_2_test.py b/tests/functional/gtcs/test_transactions_autocommit_2.py similarity index 100% rename from tests/functional/gtcs/transactions_autocommit_2_test.py rename to tests/functional/gtcs/test_transactions_autocommit_2.py diff --git a/tests/functional/gtcs/transactions_autocommit_3_test.py b/tests/functional/gtcs/test_transactions_autocommit_3.py similarity index 100% rename from tests/functional/gtcs/transactions_autocommit_3_test.py rename to tests/functional/gtcs/test_transactions_autocommit_3.py diff --git a/tests/functional/gtcs/trigger_variable_assignment_test.py b/tests/functional/gtcs/test_trigger_variable_assignment.py similarity index 100% rename from tests/functional/gtcs/trigger_variable_assignment_test.py rename to tests/functional/gtcs/test_trigger_variable_assignment.py diff --git a/tests/functional/gtcs/window_func_01_test.py b/tests/functional/gtcs/test_window_func_01.py similarity index 100% rename from tests/functional/gtcs/window_func_01_test.py rename to tests/functional/gtcs/test_window_func_01.py diff --git a/tests/functional/gtcs/window_func_02_test.py b/tests/functional/gtcs/test_window_func_02.py similarity index 100% rename from tests/functional/gtcs/window_func_02_test.py rename to tests/functional/gtcs/test_window_func_02.py diff --git a/tests/functional/gtcs/window_func_03_test.py b/tests/functional/gtcs/test_window_func_03.py similarity index 100% rename from tests/functional/gtcs/window_func_03_test.py rename to tests/functional/gtcs/test_window_func_03.py diff --git a/tests/functional/gtcs/window_func_04_test.py b/tests/functional/gtcs/test_window_func_04.py similarity index 100% rename from tests/functional/gtcs/window_func_04_test.py rename to tests/functional/gtcs/test_window_func_04.py diff --git a/tests/functional/gtcs/window_func_05_test.py b/tests/functional/gtcs/test_window_func_05.py similarity index 100% rename from tests/functional/gtcs/window_func_05_test.py rename to tests/functional/gtcs/test_window_func_05.py diff --git a/tests/functional/index/alter/01_test.py b/tests/functional/index/alter/test_01.py similarity index 100% rename from tests/functional/index/alter/01_test.py rename to tests/functional/index/alter/test_01.py diff --git a/tests/functional/index/alter/02_test.py b/tests/functional/index/alter/test_02.py similarity index 100% rename from tests/functional/index/alter/02_test.py rename to tests/functional/index/alter/test_02.py diff --git a/tests/functional/index/alter/03_test.py b/tests/functional/index/alter/test_03.py similarity index 100% rename from tests/functional/index/alter/03_test.py rename to tests/functional/index/alter/test_03.py diff --git a/tests/functional/index/alter/04_test.py b/tests/functional/index/alter/test_04.py similarity index 100% rename from tests/functional/index/alter/04_test.py rename to tests/functional/index/alter/test_04.py diff --git a/tests/functional/index/alter/05_test.py b/tests/functional/index/alter/test_05.py similarity index 100% rename from tests/functional/index/alter/05_test.py rename to tests/functional/index/alter/test_05.py diff --git a/tests/functional/index/create/01_test.py b/tests/functional/index/create/test_01.py similarity index 100% rename from tests/functional/index/create/01_test.py rename to tests/functional/index/create/test_01.py diff --git a/tests/functional/index/create/02_test.py b/tests/functional/index/create/test_02.py similarity index 100% rename from tests/functional/index/create/02_test.py rename to tests/functional/index/create/test_02.py diff --git a/tests/functional/index/create/03_test.py b/tests/functional/index/create/test_03.py similarity index 100% rename from tests/functional/index/create/03_test.py rename to tests/functional/index/create/test_03.py diff --git a/tests/functional/index/create/04_test.py b/tests/functional/index/create/test_04.py similarity index 100% rename from tests/functional/index/create/04_test.py rename to tests/functional/index/create/test_04.py diff --git a/tests/functional/index/create/05_test.py b/tests/functional/index/create/test_05.py similarity index 100% rename from tests/functional/index/create/05_test.py rename to tests/functional/index/create/test_05.py diff --git a/tests/functional/index/create/06_test.py b/tests/functional/index/create/test_06.py similarity index 100% rename from tests/functional/index/create/06_test.py rename to tests/functional/index/create/test_06.py diff --git a/tests/functional/index/create/07_test.py b/tests/functional/index/create/test_07.py similarity index 100% rename from tests/functional/index/create/07_test.py rename to tests/functional/index/create/test_07.py diff --git a/tests/functional/index/create/08_test.py b/tests/functional/index/create/test_08.py similarity index 100% rename from tests/functional/index/create/08_test.py rename to tests/functional/index/create/test_08.py diff --git a/tests/functional/index/create/09_test.py b/tests/functional/index/create/test_09.py similarity index 100% rename from tests/functional/index/create/09_test.py rename to tests/functional/index/create/test_09.py diff --git a/tests/functional/index/create/10_test.py b/tests/functional/index/create/test_10.py similarity index 100% rename from tests/functional/index/create/10_test.py rename to tests/functional/index/create/test_10.py diff --git a/tests/functional/index/create/11_test.py b/tests/functional/index/create/test_11.py similarity index 100% rename from tests/functional/index/create/11_test.py rename to tests/functional/index/create/test_11.py diff --git a/tests/functional/index/create/12_test.py b/tests/functional/index/create/test_12.py similarity index 100% rename from tests/functional/index/create/12_test.py rename to tests/functional/index/create/test_12.py diff --git a/tests/functional/intfunc/avg/01_test.py b/tests/functional/intfunc/avg/test_01.py similarity index 100% rename from tests/functional/intfunc/avg/01_test.py rename to tests/functional/intfunc/avg/test_01.py diff --git a/tests/functional/intfunc/avg/02_test.py b/tests/functional/intfunc/avg/test_02.py similarity index 100% rename from tests/functional/intfunc/avg/02_test.py rename to tests/functional/intfunc/avg/test_02.py diff --git a/tests/functional/intfunc/avg/03_test.py b/tests/functional/intfunc/avg/test_03.py similarity index 100% rename from tests/functional/intfunc/avg/03_test.py rename to tests/functional/intfunc/avg/test_03.py diff --git a/tests/functional/intfunc/avg/04_test.py b/tests/functional/intfunc/avg/test_04.py similarity index 100% rename from tests/functional/intfunc/avg/04_test.py rename to tests/functional/intfunc/avg/test_04.py diff --git a/tests/functional/intfunc/avg/05_test.py b/tests/functional/intfunc/avg/test_05.py similarity index 100% rename from tests/functional/intfunc/avg/05_test.py rename to tests/functional/intfunc/avg/test_05.py diff --git a/tests/functional/intfunc/avg/06_test.py b/tests/functional/intfunc/avg/test_06.py similarity index 100% rename from tests/functional/intfunc/avg/06_test.py rename to tests/functional/intfunc/avg/test_06.py diff --git a/tests/functional/intfunc/avg/07_test.py b/tests/functional/intfunc/avg/test_07.py similarity index 100% rename from tests/functional/intfunc/avg/07_test.py rename to tests/functional/intfunc/avg/test_07.py diff --git a/tests/functional/intfunc/avg/08_test.py b/tests/functional/intfunc/avg/test_08.py similarity index 100% rename from tests/functional/intfunc/avg/08_test.py rename to tests/functional/intfunc/avg/test_08.py diff --git a/tests/functional/intfunc/avg/09_test.py b/tests/functional/intfunc/avg/test_09.py similarity index 100% rename from tests/functional/intfunc/avg/09_test.py rename to tests/functional/intfunc/avg/test_09.py diff --git a/tests/functional/intfunc/binary/and_01_test.py b/tests/functional/intfunc/binary/test_and_01.py similarity index 100% rename from tests/functional/intfunc/binary/and_01_test.py rename to tests/functional/intfunc/binary/test_and_01.py diff --git a/tests/functional/intfunc/binary/or_01_test.py b/tests/functional/intfunc/binary/test_or_01.py similarity index 100% rename from tests/functional/intfunc/binary/or_01_test.py rename to tests/functional/intfunc/binary/test_or_01.py diff --git a/tests/functional/intfunc/binary/shl_01_test.py b/tests/functional/intfunc/binary/test_shl_01.py similarity index 100% rename from tests/functional/intfunc/binary/shl_01_test.py rename to tests/functional/intfunc/binary/test_shl_01.py diff --git a/tests/functional/intfunc/binary/shr_01_test.py b/tests/functional/intfunc/binary/test_shr_01.py similarity index 100% rename from tests/functional/intfunc/binary/shr_01_test.py rename to tests/functional/intfunc/binary/test_shr_01.py diff --git a/tests/functional/intfunc/binary/xor_01_test.py b/tests/functional/intfunc/binary/test_xor_01.py similarity index 100% rename from tests/functional/intfunc/binary/xor_01_test.py rename to tests/functional/intfunc/binary/test_xor_01.py diff --git a/tests/functional/intfunc/cast/01_test.py b/tests/functional/intfunc/cast/test_01.py similarity index 100% rename from tests/functional/intfunc/cast/01_test.py rename to tests/functional/intfunc/cast/test_01.py diff --git a/tests/functional/intfunc/cast/02_test.py b/tests/functional/intfunc/cast/test_02.py similarity index 100% rename from tests/functional/intfunc/cast/02_test.py rename to tests/functional/intfunc/cast/test_02.py diff --git a/tests/functional/intfunc/cast/03_test.py b/tests/functional/intfunc/cast/test_03.py similarity index 100% rename from tests/functional/intfunc/cast/03_test.py rename to tests/functional/intfunc/cast/test_03.py diff --git a/tests/functional/intfunc/cast/04_test.py b/tests/functional/intfunc/cast/test_04.py similarity index 100% rename from tests/functional/intfunc/cast/04_test.py rename to tests/functional/intfunc/cast/test_04.py diff --git a/tests/functional/intfunc/cast/05_test.py b/tests/functional/intfunc/cast/test_05.py similarity index 100% rename from tests/functional/intfunc/cast/05_test.py rename to tests/functional/intfunc/cast/test_05.py diff --git a/tests/functional/intfunc/cast/06_test.py b/tests/functional/intfunc/cast/test_06.py similarity index 100% rename from tests/functional/intfunc/cast/06_test.py rename to tests/functional/intfunc/cast/test_06.py diff --git a/tests/functional/intfunc/cast/07_test.py b/tests/functional/intfunc/cast/test_07.py similarity index 100% rename from tests/functional/intfunc/cast/07_test.py rename to tests/functional/intfunc/cast/test_07.py diff --git a/tests/functional/intfunc/cast/08_test.py b/tests/functional/intfunc/cast/test_08.py similarity index 100% rename from tests/functional/intfunc/cast/08_test.py rename to tests/functional/intfunc/cast/test_08.py diff --git a/tests/functional/intfunc/cast/09_test.py b/tests/functional/intfunc/cast/test_09.py similarity index 100% rename from tests/functional/intfunc/cast/09_test.py rename to tests/functional/intfunc/cast/test_09.py diff --git a/tests/functional/intfunc/cast/10_test.py b/tests/functional/intfunc/cast/test_10.py similarity index 100% rename from tests/functional/intfunc/cast/10_test.py rename to tests/functional/intfunc/cast/test_10.py diff --git a/tests/functional/intfunc/cast/11_test.py b/tests/functional/intfunc/cast/test_11.py similarity index 100% rename from tests/functional/intfunc/cast/11_test.py rename to tests/functional/intfunc/cast/test_11.py diff --git a/tests/functional/intfunc/cast/12_test.py b/tests/functional/intfunc/cast/test_12.py similarity index 100% rename from tests/functional/intfunc/cast/12_test.py rename to tests/functional/intfunc/cast/test_12.py diff --git a/tests/functional/intfunc/cast/13_test.py b/tests/functional/intfunc/cast/test_13.py similarity index 100% rename from tests/functional/intfunc/cast/13_test.py rename to tests/functional/intfunc/cast/test_13.py diff --git a/tests/functional/intfunc/cast/14_test.py b/tests/functional/intfunc/cast/test_14.py similarity index 100% rename from tests/functional/intfunc/cast/14_test.py rename to tests/functional/intfunc/cast/test_14.py diff --git a/tests/functional/intfunc/cast/15_test.py b/tests/functional/intfunc/cast/test_15.py similarity index 100% rename from tests/functional/intfunc/cast/15_test.py rename to tests/functional/intfunc/cast/test_15.py diff --git a/tests/functional/intfunc/cast/16_test.py b/tests/functional/intfunc/cast/test_16.py similarity index 100% rename from tests/functional/intfunc/cast/16_test.py rename to tests/functional/intfunc/cast/test_16.py diff --git a/tests/functional/intfunc/cast/17_test.py b/tests/functional/intfunc/cast/test_17.py similarity index 100% rename from tests/functional/intfunc/cast/17_test.py rename to tests/functional/intfunc/cast/test_17.py diff --git a/tests/functional/intfunc/cast/18_test.py b/tests/functional/intfunc/cast/test_18.py similarity index 100% rename from tests/functional/intfunc/cast/18_test.py rename to tests/functional/intfunc/cast/test_18.py diff --git a/tests/functional/intfunc/cast/19_test.py b/tests/functional/intfunc/cast/test_19.py similarity index 100% rename from tests/functional/intfunc/cast/19_test.py rename to tests/functional/intfunc/cast/test_19.py diff --git a/tests/functional/intfunc/cast/20_test.py b/tests/functional/intfunc/cast/test_20.py similarity index 100% rename from tests/functional/intfunc/cast/20_test.py rename to tests/functional/intfunc/cast/test_20.py diff --git a/tests/functional/intfunc/cast/21_test.py b/tests/functional/intfunc/cast/test_21.py similarity index 100% rename from tests/functional/intfunc/cast/21_test.py rename to tests/functional/intfunc/cast/test_21.py diff --git a/tests/functional/intfunc/cast/22_test.py b/tests/functional/intfunc/cast/test_22.py similarity index 100% rename from tests/functional/intfunc/cast/22_test.py rename to tests/functional/intfunc/cast/test_22.py diff --git a/tests/functional/intfunc/cast/23_test.py b/tests/functional/intfunc/cast/test_23.py similarity index 100% rename from tests/functional/intfunc/cast/23_test.py rename to tests/functional/intfunc/cast/test_23.py diff --git a/tests/functional/intfunc/count/01_test.py b/tests/functional/intfunc/count/test_01.py similarity index 100% rename from tests/functional/intfunc/count/01_test.py rename to tests/functional/intfunc/count/test_01.py diff --git a/tests/functional/intfunc/count/02_test.py b/tests/functional/intfunc/count/test_02.py similarity index 100% rename from tests/functional/intfunc/count/02_test.py rename to tests/functional/intfunc/count/test_02.py diff --git a/tests/functional/intfunc/date/dateadd_01_test.py b/tests/functional/intfunc/date/test_dateadd_01.py similarity index 100% rename from tests/functional/intfunc/date/dateadd_01_test.py rename to tests/functional/intfunc/date/test_dateadd_01.py diff --git a/tests/functional/intfunc/date/dateadd_02_test.py b/tests/functional/intfunc/date/test_dateadd_02.py similarity index 100% rename from tests/functional/intfunc/date/dateadd_02_test.py rename to tests/functional/intfunc/date/test_dateadd_02.py diff --git a/tests/functional/intfunc/date/dateadd_03_test.py b/tests/functional/intfunc/date/test_dateadd_03.py similarity index 100% rename from tests/functional/intfunc/date/dateadd_03_test.py rename to tests/functional/intfunc/date/test_dateadd_03.py diff --git a/tests/functional/intfunc/date/dateadd_04_test.py b/tests/functional/intfunc/date/test_dateadd_04.py similarity index 100% rename from tests/functional/intfunc/date/dateadd_04_test.py rename to tests/functional/intfunc/date/test_dateadd_04.py diff --git a/tests/functional/intfunc/date/dateadd_05_test.py b/tests/functional/intfunc/date/test_dateadd_05.py similarity index 100% rename from tests/functional/intfunc/date/dateadd_05_test.py rename to tests/functional/intfunc/date/test_dateadd_05.py diff --git a/tests/functional/intfunc/date/dateadd_06_test.py b/tests/functional/intfunc/date/test_dateadd_06.py similarity index 100% rename from tests/functional/intfunc/date/dateadd_06_test.py rename to tests/functional/intfunc/date/test_dateadd_06.py diff --git a/tests/functional/intfunc/date/dateadd_07_test.py b/tests/functional/intfunc/date/test_dateadd_07.py similarity index 100% rename from tests/functional/intfunc/date/dateadd_07_test.py rename to tests/functional/intfunc/date/test_dateadd_07.py diff --git a/tests/functional/intfunc/date/dateadd_08_test.py b/tests/functional/intfunc/date/test_dateadd_08.py similarity index 100% rename from tests/functional/intfunc/date/dateadd_08_test.py rename to tests/functional/intfunc/date/test_dateadd_08.py diff --git a/tests/functional/intfunc/date/datediff_01_test.py b/tests/functional/intfunc/date/test_datediff_01.py similarity index 100% rename from tests/functional/intfunc/date/datediff_01_test.py rename to tests/functional/intfunc/date/test_datediff_01.py diff --git a/tests/functional/intfunc/date/datediff_02_test.py b/tests/functional/intfunc/date/test_datediff_02.py similarity index 100% rename from tests/functional/intfunc/date/datediff_02_test.py rename to tests/functional/intfunc/date/test_datediff_02.py diff --git a/tests/functional/intfunc/date/datediff_03_test.py b/tests/functional/intfunc/date/test_datediff_03.py similarity index 100% rename from tests/functional/intfunc/date/datediff_03_test.py rename to tests/functional/intfunc/date/test_datediff_03.py diff --git a/tests/functional/intfunc/date/datediff_04_test.py b/tests/functional/intfunc/date/test_datediff_04.py similarity index 100% rename from tests/functional/intfunc/date/datediff_04_test.py rename to tests/functional/intfunc/date/test_datediff_04.py diff --git a/tests/functional/intfunc/date/datediff_05_test.py b/tests/functional/intfunc/date/test_datediff_05.py similarity index 100% rename from tests/functional/intfunc/date/datediff_05_test.py rename to tests/functional/intfunc/date/test_datediff_05.py diff --git a/tests/functional/intfunc/date/datediff_06_test.py b/tests/functional/intfunc/date/test_datediff_06.py similarity index 100% rename from tests/functional/intfunc/date/datediff_06_test.py rename to tests/functional/intfunc/date/test_datediff_06.py diff --git a/tests/functional/intfunc/date/datediff_07_test.py b/tests/functional/intfunc/date/test_datediff_07.py similarity index 100% rename from tests/functional/intfunc/date/datediff_07_test.py rename to tests/functional/intfunc/date/test_datediff_07.py diff --git a/tests/functional/intfunc/date/extract_01_test.py b/tests/functional/intfunc/date/test_extract_01.py similarity index 100% rename from tests/functional/intfunc/date/extract_01_test.py rename to tests/functional/intfunc/date/test_extract_01.py diff --git a/tests/functional/intfunc/date/extract_02_test.py b/tests/functional/intfunc/date/test_extract_02.py similarity index 100% rename from tests/functional/intfunc/date/extract_02_test.py rename to tests/functional/intfunc/date/test_extract_02.py diff --git a/tests/functional/intfunc/encryption/block_cipher_basic_test.py b/tests/functional/intfunc/encryption/test_block_cipher_basic.py similarity index 100% rename from tests/functional/intfunc/encryption/block_cipher_basic_test.py rename to tests/functional/intfunc/encryption/test_block_cipher_basic.py diff --git a/tests/functional/intfunc/encryption/block_cipher_special_test.py b/tests/functional/intfunc/encryption/test_block_cipher_special.py similarity index 100% rename from tests/functional/intfunc/encryption/block_cipher_special_test.py rename to tests/functional/intfunc/encryption/test_block_cipher_special.py diff --git a/tests/functional/intfunc/list/01_test.py b/tests/functional/intfunc/list/test_01.py similarity index 100% rename from tests/functional/intfunc/list/01_test.py rename to tests/functional/intfunc/list/test_01.py diff --git a/tests/functional/intfunc/list/02_test.py b/tests/functional/intfunc/list/test_02.py similarity index 100% rename from tests/functional/intfunc/list/02_test.py rename to tests/functional/intfunc/list/test_02.py diff --git a/tests/functional/intfunc/list/03_test.py b/tests/functional/intfunc/list/test_03.py similarity index 100% rename from tests/functional/intfunc/list/03_test.py rename to tests/functional/intfunc/list/test_03.py diff --git a/tests/functional/intfunc/math/abs_01_test.py b/tests/functional/intfunc/math/test_abs_01.py similarity index 100% rename from tests/functional/intfunc/math/abs_01_test.py rename to tests/functional/intfunc/math/test_abs_01.py diff --git a/tests/functional/intfunc/math/acos_01_test.py b/tests/functional/intfunc/math/test_acos_01.py similarity index 100% rename from tests/functional/intfunc/math/acos_01_test.py rename to tests/functional/intfunc/math/test_acos_01.py diff --git a/tests/functional/intfunc/math/asin_01_test.py b/tests/functional/intfunc/math/test_asin_01.py similarity index 100% rename from tests/functional/intfunc/math/asin_01_test.py rename to tests/functional/intfunc/math/test_asin_01.py diff --git a/tests/functional/intfunc/math/atan2_01_test.py b/tests/functional/intfunc/math/test_atan2_01.py similarity index 100% rename from tests/functional/intfunc/math/atan2_01_test.py rename to tests/functional/intfunc/math/test_atan2_01.py diff --git a/tests/functional/intfunc/math/atan_01_test.py b/tests/functional/intfunc/math/test_atan_01.py similarity index 100% rename from tests/functional/intfunc/math/atan_01_test.py rename to tests/functional/intfunc/math/test_atan_01.py diff --git a/tests/functional/intfunc/math/ceil_01_test.py b/tests/functional/intfunc/math/test_ceil_01.py similarity index 100% rename from tests/functional/intfunc/math/ceil_01_test.py rename to tests/functional/intfunc/math/test_ceil_01.py diff --git a/tests/functional/intfunc/math/cos_01_test.py b/tests/functional/intfunc/math/test_cos_01.py similarity index 100% rename from tests/functional/intfunc/math/cos_01_test.py rename to tests/functional/intfunc/math/test_cos_01.py diff --git a/tests/functional/intfunc/math/cosh_01_test.py b/tests/functional/intfunc/math/test_cosh_01.py similarity index 100% rename from tests/functional/intfunc/math/cosh_01_test.py rename to tests/functional/intfunc/math/test_cosh_01.py diff --git a/tests/functional/intfunc/math/cot_01_test.py b/tests/functional/intfunc/math/test_cot_01.py similarity index 100% rename from tests/functional/intfunc/math/cot_01_test.py rename to tests/functional/intfunc/math/test_cot_01.py diff --git a/tests/functional/intfunc/math/exp_01_test.py b/tests/functional/intfunc/math/test_exp_01.py similarity index 100% rename from tests/functional/intfunc/math/exp_01_test.py rename to tests/functional/intfunc/math/test_exp_01.py diff --git a/tests/functional/intfunc/math/floor_01_test.py b/tests/functional/intfunc/math/test_floor_01.py similarity index 100% rename from tests/functional/intfunc/math/floor_01_test.py rename to tests/functional/intfunc/math/test_floor_01.py diff --git a/tests/functional/intfunc/math/ln_01_test.py b/tests/functional/intfunc/math/test_ln_01.py similarity index 100% rename from tests/functional/intfunc/math/ln_01_test.py rename to tests/functional/intfunc/math/test_ln_01.py diff --git a/tests/functional/intfunc/math/log10_01_test.py b/tests/functional/intfunc/math/test_log10_01.py similarity index 100% rename from tests/functional/intfunc/math/log10_01_test.py rename to tests/functional/intfunc/math/test_log10_01.py diff --git a/tests/functional/intfunc/math/log_01_test.py b/tests/functional/intfunc/math/test_log_01.py similarity index 100% rename from tests/functional/intfunc/math/log_01_test.py rename to tests/functional/intfunc/math/test_log_01.py diff --git a/tests/functional/intfunc/math/maxvalue_01_test.py b/tests/functional/intfunc/math/test_maxvalue_01.py similarity index 100% rename from tests/functional/intfunc/math/maxvalue_01_test.py rename to tests/functional/intfunc/math/test_maxvalue_01.py diff --git a/tests/functional/intfunc/math/minvalue_01_test.py b/tests/functional/intfunc/math/test_minvalue_01.py similarity index 100% rename from tests/functional/intfunc/math/minvalue_01_test.py rename to tests/functional/intfunc/math/test_minvalue_01.py diff --git a/tests/functional/intfunc/math/mod_01_test.py b/tests/functional/intfunc/math/test_mod_01.py similarity index 100% rename from tests/functional/intfunc/math/mod_01_test.py rename to tests/functional/intfunc/math/test_mod_01.py diff --git a/tests/functional/intfunc/math/pi_01_test.py b/tests/functional/intfunc/math/test_pi_01.py similarity index 100% rename from tests/functional/intfunc/math/pi_01_test.py rename to tests/functional/intfunc/math/test_pi_01.py diff --git a/tests/functional/intfunc/math/power_01_test.py b/tests/functional/intfunc/math/test_power_01.py similarity index 100% rename from tests/functional/intfunc/math/power_01_test.py rename to tests/functional/intfunc/math/test_power_01.py diff --git a/tests/functional/intfunc/math/rand_01_test.py b/tests/functional/intfunc/math/test_rand_01.py similarity index 100% rename from tests/functional/intfunc/math/rand_01_test.py rename to tests/functional/intfunc/math/test_rand_01.py diff --git a/tests/functional/intfunc/math/round_01_test.py b/tests/functional/intfunc/math/test_round_01.py similarity index 100% rename from tests/functional/intfunc/math/round_01_test.py rename to tests/functional/intfunc/math/test_round_01.py diff --git a/tests/functional/intfunc/math/sign_01_test.py b/tests/functional/intfunc/math/test_sign_01.py similarity index 100% rename from tests/functional/intfunc/math/sign_01_test.py rename to tests/functional/intfunc/math/test_sign_01.py diff --git a/tests/functional/intfunc/math/sin_01_test.py b/tests/functional/intfunc/math/test_sin_01.py similarity index 100% rename from tests/functional/intfunc/math/sin_01_test.py rename to tests/functional/intfunc/math/test_sin_01.py diff --git a/tests/functional/intfunc/math/sinh_01_test.py b/tests/functional/intfunc/math/test_sinh_01.py similarity index 100% rename from tests/functional/intfunc/math/sinh_01_test.py rename to tests/functional/intfunc/math/test_sinh_01.py diff --git a/tests/functional/intfunc/math/sqrt_01_test.py b/tests/functional/intfunc/math/test_sqrt_01.py similarity index 100% rename from tests/functional/intfunc/math/sqrt_01_test.py rename to tests/functional/intfunc/math/test_sqrt_01.py diff --git a/tests/functional/intfunc/math/tan_01_test.py b/tests/functional/intfunc/math/test_tan_01.py similarity index 100% rename from tests/functional/intfunc/math/tan_01_test.py rename to tests/functional/intfunc/math/test_tan_01.py diff --git a/tests/functional/intfunc/math/tanh_01_test.py b/tests/functional/intfunc/math/test_tanh_01.py similarity index 100% rename from tests/functional/intfunc/math/tanh_01_test.py rename to tests/functional/intfunc/math/test_tanh_01.py diff --git a/tests/functional/intfunc/math/trunc_01_test.py b/tests/functional/intfunc/math/test_trunc_01.py similarity index 100% rename from tests/functional/intfunc/math/trunc_01_test.py rename to tests/functional/intfunc/math/test_trunc_01.py diff --git a/tests/functional/intfunc/misc/decode_01_test.py b/tests/functional/intfunc/misc/test_decode_01.py similarity index 100% rename from tests/functional/intfunc/misc/decode_01_test.py rename to tests/functional/intfunc/misc/test_decode_01.py diff --git a/tests/functional/intfunc/misc/gen_uuid_01_test.py b/tests/functional/intfunc/misc/test_gen_uuid_01.py similarity index 100% rename from tests/functional/intfunc/misc/gen_uuid_01_test.py rename to tests/functional/intfunc/misc/test_gen_uuid_01.py diff --git a/tests/functional/intfunc/misc/hash_01_test.py b/tests/functional/intfunc/misc/test_hash_01.py similarity index 100% rename from tests/functional/intfunc/misc/hash_01_test.py rename to tests/functional/intfunc/misc/test_hash_01.py diff --git a/tests/functional/intfunc/string/ascii_01_test.py b/tests/functional/intfunc/string/test_ascii_01.py similarity index 100% rename from tests/functional/intfunc/string/ascii_01_test.py rename to tests/functional/intfunc/string/test_ascii_01.py diff --git a/tests/functional/intfunc/string/ascii_val_01_test.py b/tests/functional/intfunc/string/test_ascii_val_01.py similarity index 100% rename from tests/functional/intfunc/string/ascii_val_01_test.py rename to tests/functional/intfunc/string/test_ascii_val_01.py diff --git a/tests/functional/intfunc/string/left_01_test.py b/tests/functional/intfunc/string/test_left_01.py similarity index 100% rename from tests/functional/intfunc/string/left_01_test.py rename to tests/functional/intfunc/string/test_left_01.py diff --git a/tests/functional/intfunc/string/lpad_01_test.py b/tests/functional/intfunc/string/test_lpad_01.py similarity index 100% rename from tests/functional/intfunc/string/lpad_01_test.py rename to tests/functional/intfunc/string/test_lpad_01.py diff --git a/tests/functional/intfunc/string/overlay_01_test.py b/tests/functional/intfunc/string/test_overlay_01.py similarity index 100% rename from tests/functional/intfunc/string/overlay_01_test.py rename to tests/functional/intfunc/string/test_overlay_01.py diff --git a/tests/functional/intfunc/string/position_01_test.py b/tests/functional/intfunc/string/test_position_01.py similarity index 100% rename from tests/functional/intfunc/string/position_01_test.py rename to tests/functional/intfunc/string/test_position_01.py diff --git a/tests/functional/intfunc/string/position_02_test.py b/tests/functional/intfunc/string/test_position_02.py similarity index 100% rename from tests/functional/intfunc/string/position_02_test.py rename to tests/functional/intfunc/string/test_position_02.py diff --git a/tests/functional/intfunc/string/replace_01_test.py b/tests/functional/intfunc/string/test_replace_01.py similarity index 100% rename from tests/functional/intfunc/string/replace_01_test.py rename to tests/functional/intfunc/string/test_replace_01.py diff --git a/tests/functional/intfunc/string/reverse_01_test.py b/tests/functional/intfunc/string/test_reverse_01.py similarity index 100% rename from tests/functional/intfunc/string/reverse_01_test.py rename to tests/functional/intfunc/string/test_reverse_01.py diff --git a/tests/functional/intfunc/string/right_01_test.py b/tests/functional/intfunc/string/test_right_01.py similarity index 100% rename from tests/functional/intfunc/string/right_01_test.py rename to tests/functional/intfunc/string/test_right_01.py diff --git a/tests/functional/intfunc/string/rpad_01_test.py b/tests/functional/intfunc/string/test_rpad_01.py similarity index 100% rename from tests/functional/intfunc/string/rpad_01_test.py rename to tests/functional/intfunc/string/test_rpad_01.py diff --git a/tests/functional/monitoring/01_test.py b/tests/functional/monitoring/test_01.py similarity index 100% rename from tests/functional/monitoring/01_test.py rename to tests/functional/monitoring/test_01.py diff --git a/tests/functional/monitoring/02_test.py b/tests/functional/monitoring/test_02.py similarity index 100% rename from tests/functional/monitoring/02_test.py rename to tests/functional/monitoring/test_02.py diff --git a/tests/functional/monitoring/04_test.py b/tests/functional/monitoring/test_04.py similarity index 100% rename from tests/functional/monitoring/04_test.py rename to tests/functional/monitoring/test_04.py diff --git a/tests/functional/procedure/alter/01_test.py b/tests/functional/procedure/alter/test_01.py similarity index 100% rename from tests/functional/procedure/alter/01_test.py rename to tests/functional/procedure/alter/test_01.py diff --git a/tests/functional/procedure/alter/02_test.py b/tests/functional/procedure/alter/test_02.py similarity index 100% rename from tests/functional/procedure/alter/02_test.py rename to tests/functional/procedure/alter/test_02.py diff --git a/tests/functional/procedure/create/01_test.py b/tests/functional/procedure/create/test_01.py similarity index 100% rename from tests/functional/procedure/create/01_test.py rename to tests/functional/procedure/create/test_01.py diff --git a/tests/functional/procedure/create/02_test.py b/tests/functional/procedure/create/test_02.py similarity index 100% rename from tests/functional/procedure/create/02_test.py rename to tests/functional/procedure/create/test_02.py diff --git a/tests/functional/procedure/create/03_test.py b/tests/functional/procedure/create/test_03.py similarity index 100% rename from tests/functional/procedure/create/03_test.py rename to tests/functional/procedure/create/test_03.py diff --git a/tests/functional/procedure/create/04_test.py b/tests/functional/procedure/create/test_04.py similarity index 100% rename from tests/functional/procedure/create/04_test.py rename to tests/functional/procedure/create/test_04.py diff --git a/tests/functional/procedure/create/05_test.py b/tests/functional/procedure/create/test_05.py similarity index 100% rename from tests/functional/procedure/create/05_test.py rename to tests/functional/procedure/create/test_05.py diff --git a/tests/functional/procedure/create/06_test.py b/tests/functional/procedure/create/test_06.py similarity index 100% rename from tests/functional/procedure/create/06_test.py rename to tests/functional/procedure/create/test_06.py diff --git a/tests/functional/procedure/create/07_test.py b/tests/functional/procedure/create/test_07.py similarity index 100% rename from tests/functional/procedure/create/07_test.py rename to tests/functional/procedure/create/test_07.py diff --git a/tests/functional/procedure/create/08_test.py b/tests/functional/procedure/create/test_08.py similarity index 100% rename from tests/functional/procedure/create/08_test.py rename to tests/functional/procedure/create/test_08.py diff --git a/tests/functional/procedure/create/15_test.py b/tests/functional/procedure/create/test_15.py similarity index 100% rename from tests/functional/procedure/create/15_test.py rename to tests/functional/procedure/create/test_15.py diff --git a/tests/functional/procedure/create/16_test.py b/tests/functional/procedure/create/test_16.py similarity index 100% rename from tests/functional/procedure/create/16_test.py rename to tests/functional/procedure/create/test_16.py diff --git a/tests/functional/role/create/01_test.py b/tests/functional/role/create/test_01.py similarity index 100% rename from tests/functional/role/create/01_test.py rename to tests/functional/role/create/test_01.py diff --git a/tests/functional/role/create/02_test.py b/tests/functional/role/create/test_02.py similarity index 100% rename from tests/functional/role/create/02_test.py rename to tests/functional/role/create/test_02.py diff --git a/tests/functional/services/role_in_service_attachment_test.py b/tests/functional/services/test_role_in_service_attachment.py similarity index 100% rename from tests/functional/services/role_in_service_attachment_test.py rename to tests/functional/services/test_role_in_service_attachment.py diff --git a/tests/functional/services/user_management_test.py b/tests/functional/services/test_user_management.py similarity index 100% rename from tests/functional/services/user_management_test.py rename to tests/functional/services/test_user_management.py diff --git a/tests/functional/session/alter_session_reset_test.py b/tests/functional/session/test_alter_session_reset.py similarity index 100% rename from tests/functional/session/alter_session_reset_test.py rename to tests/functional/session/test_alter_session_reset.py diff --git a/tests/functional/session/alter_session_reset_allow_2pc_prepared_test.py b/tests/functional/session/test_alter_session_reset_allow_2pc_prepared.py similarity index 100% rename from tests/functional/session/alter_session_reset_allow_2pc_prepared_test.py rename to tests/functional/session/test_alter_session_reset_allow_2pc_prepared.py diff --git a/tests/functional/session/alter_session_reset_clear_gtt_test.py b/tests/functional/session/test_alter_session_reset_clear_gtt.py similarity index 100% rename from tests/functional/session/alter_session_reset_clear_gtt_test.py rename to tests/functional/session/test_alter_session_reset_clear_gtt.py diff --git a/tests/functional/session/alter_session_reset_clear_timeouts_test.py b/tests/functional/session/test_alter_session_reset_clear_timeouts.py similarity index 100% rename from tests/functional/session/alter_session_reset_clear_timeouts_test.py rename to tests/functional/session/test_alter_session_reset_clear_timeouts.py diff --git a/tests/functional/session/alter_session_reset_decfloat_test.py b/tests/functional/session/test_alter_session_reset_decfloat.py similarity index 100% rename from tests/functional/session/alter_session_reset_decfloat_test.py rename to tests/functional/session/test_alter_session_reset_decfloat.py diff --git a/tests/functional/session/alter_session_reset_raise_if_open_tx_test.py b/tests/functional/session/test_alter_session_reset_raise_if_open_tx.py similarity index 100% rename from tests/functional/session/alter_session_reset_raise_if_open_tx_test.py rename to tests/functional/session/test_alter_session_reset_raise_if_open_tx.py diff --git a/tests/functional/session/alter_session_reset_remove_context_vars_test.py b/tests/functional/session/test_alter_session_reset_remove_context_vars.py similarity index 100% rename from tests/functional/session/alter_session_reset_remove_context_vars_test.py rename to tests/functional/session/test_alter_session_reset_remove_context_vars.py diff --git a/tests/functional/session/alter_session_reset_restore_role_test.py b/tests/functional/session/test_alter_session_reset_restore_role.py similarity index 100% rename from tests/functional/session/alter_session_reset_restore_role_test.py rename to tests/functional/session/test_alter_session_reset_restore_role.py diff --git a/tests/functional/session/alter_session_reset_rollback_test.py b/tests/functional/session/test_alter_session_reset_rollback.py similarity index 100% rename from tests/functional/session/alter_session_reset_rollback_test.py rename to tests/functional/session/test_alter_session_reset_rollback.py diff --git a/tests/functional/session/alter_session_reset_start_new_tx_test.py b/tests/functional/session/test_alter_session_reset_start_new_tx.py similarity index 100% rename from tests/functional/session/alter_session_reset_start_new_tx_test.py rename to tests/functional/session/test_alter_session_reset_start_new_tx.py diff --git a/tests/functional/session/ext_conn_pool_01_test.py b/tests/functional/session/test_ext_conn_pool_01.py similarity index 100% rename from tests/functional/session/ext_conn_pool_01_test.py rename to tests/functional/session/test_ext_conn_pool_01.py diff --git a/tests/functional/shadow/create_01_test.py b/tests/functional/shadow/test_create_01.py similarity index 100% rename from tests/functional/shadow/create_01_test.py rename to tests/functional/shadow/test_create_01.py diff --git a/tests/functional/shadow/create_02_test.py b/tests/functional/shadow/test_create_02.py similarity index 100% rename from tests/functional/shadow/create_02_test.py rename to tests/functional/shadow/test_create_02.py diff --git a/tests/functional/syspriv/access_any_object_test.py b/tests/functional/syspriv/test_access_any_object.py similarity index 100% rename from tests/functional/syspriv/access_any_object_test.py rename to tests/functional/syspriv/test_access_any_object.py diff --git a/tests/functional/syspriv/access_shutdown_database_test.py b/tests/functional/syspriv/test_access_shutdown_database.py similarity index 100% rename from tests/functional/syspriv/access_shutdown_database_test.py rename to tests/functional/syspriv/test_access_shutdown_database.py diff --git a/tests/functional/syspriv/change_header_settings_test.py b/tests/functional/syspriv/test_change_header_settings.py similarity index 100% rename from tests/functional/syspriv/change_header_settings_test.py rename to tests/functional/syspriv/test_change_header_settings.py diff --git a/tests/functional/syspriv/change_shutdown_mode_test.py b/tests/functional/syspriv/test_change_shutdown_mode.py similarity index 100% rename from tests/functional/syspriv/change_shutdown_mode_test.py rename to tests/functional/syspriv/test_change_shutdown_mode.py diff --git a/tests/functional/syspriv/create_privileged_roles_test.py b/tests/functional/syspriv/test_create_privileged_roles.py similarity index 100% rename from tests/functional/syspriv/create_privileged_roles_test.py rename to tests/functional/syspriv/test_create_privileged_roles.py diff --git a/tests/functional/syspriv/create_user_types_test.py b/tests/functional/syspriv/test_create_user_types.py similarity index 100% rename from tests/functional/syspriv/create_user_types_test.py rename to tests/functional/syspriv/test_create_user_types.py diff --git a/tests/functional/syspriv/drop_database_test.py b/tests/functional/syspriv/test_drop_database.py similarity index 100% rename from tests/functional/syspriv/drop_database_test.py rename to tests/functional/syspriv/test_drop_database.py diff --git a/tests/functional/syspriv/grant_revoke_any_object_test.py b/tests/functional/syspriv/test_grant_revoke_any_object.py similarity index 100% rename from tests/functional/syspriv/grant_revoke_any_object_test.py rename to tests/functional/syspriv/test_grant_revoke_any_object.py diff --git a/tests/functional/syspriv/monitor_any_attachment_test.py b/tests/functional/syspriv/test_monitor_any_attachment.py similarity index 100% rename from tests/functional/syspriv/monitor_any_attachment_test.py rename to tests/functional/syspriv/test_monitor_any_attachment.py diff --git a/tests/functional/syspriv/trace_any_attachment_test.py b/tests/functional/syspriv/test_trace_any_attachment.py similarity index 100% rename from tests/functional/syspriv/trace_any_attachment_test.py rename to tests/functional/syspriv/test_trace_any_attachment.py diff --git a/tests/functional/syspriv/use_gbak_utility_test.py b/tests/functional/syspriv/test_use_gbak_utility.py similarity index 100% rename from tests/functional/syspriv/use_gbak_utility_test.py rename to tests/functional/syspriv/test_use_gbak_utility.py diff --git a/tests/functional/syspriv/use_granted_by_clause_test.py b/tests/functional/syspriv/test_use_granted_by_clause.py similarity index 100% rename from tests/functional/syspriv/use_granted_by_clause_test.py rename to tests/functional/syspriv/test_use_granted_by_clause.py diff --git a/tests/functional/syspriv/use_gstat_utility_test.py b/tests/functional/syspriv/test_use_gstat_utility.py similarity index 100% rename from tests/functional/syspriv/use_gstat_utility_test.py rename to tests/functional/syspriv/test_use_gstat_utility.py diff --git a/tests/functional/syspriv/use_nbackup_utility_test.py b/tests/functional/syspriv/test_use_nbackup_utility.py similarity index 100% rename from tests/functional/syspriv/use_nbackup_utility_test.py rename to tests/functional/syspriv/test_use_nbackup_utility.py diff --git a/tests/functional/table/alter/01_test.py b/tests/functional/table/alter/test_01.py similarity index 100% rename from tests/functional/table/alter/01_test.py rename to tests/functional/table/alter/test_01.py diff --git a/tests/functional/table/alter/02_test.py b/tests/functional/table/alter/test_02.py similarity index 100% rename from tests/functional/table/alter/02_test.py rename to tests/functional/table/alter/test_02.py diff --git a/tests/functional/table/alter/03_test.py b/tests/functional/table/alter/test_03.py similarity index 100% rename from tests/functional/table/alter/03_test.py rename to tests/functional/table/alter/test_03.py diff --git a/tests/functional/table/alter/04_test.py b/tests/functional/table/alter/test_04.py similarity index 100% rename from tests/functional/table/alter/04_test.py rename to tests/functional/table/alter/test_04.py diff --git a/tests/functional/table/alter/05_test.py b/tests/functional/table/alter/test_05.py similarity index 100% rename from tests/functional/table/alter/05_test.py rename to tests/functional/table/alter/test_05.py diff --git a/tests/functional/table/alter/06_test.py b/tests/functional/table/alter/test_06.py similarity index 100% rename from tests/functional/table/alter/06_test.py rename to tests/functional/table/alter/test_06.py diff --git a/tests/functional/table/alter/07_test.py b/tests/functional/table/alter/test_07.py similarity index 100% rename from tests/functional/table/alter/07_test.py rename to tests/functional/table/alter/test_07.py diff --git a/tests/functional/table/alter/08_test.py b/tests/functional/table/alter/test_08.py similarity index 100% rename from tests/functional/table/alter/08_test.py rename to tests/functional/table/alter/test_08.py diff --git a/tests/functional/table/alter/09_test.py b/tests/functional/table/alter/test_09.py similarity index 100% rename from tests/functional/table/alter/09_test.py rename to tests/functional/table/alter/test_09.py diff --git a/tests/functional/table/alter/10_test.py b/tests/functional/table/alter/test_10.py similarity index 100% rename from tests/functional/table/alter/10_test.py rename to tests/functional/table/alter/test_10.py diff --git a/tests/functional/table/alter/11_test.py b/tests/functional/table/alter/test_11.py similarity index 100% rename from tests/functional/table/alter/11_test.py rename to tests/functional/table/alter/test_11.py diff --git a/tests/functional/table/alter/12_test.py b/tests/functional/table/alter/test_12.py similarity index 100% rename from tests/functional/table/alter/12_test.py rename to tests/functional/table/alter/test_12.py diff --git a/tests/functional/table/create/01_test.py b/tests/functional/table/create/test_01.py similarity index 100% rename from tests/functional/table/create/01_test.py rename to tests/functional/table/create/test_01.py diff --git a/tests/functional/table/create/02_test.py b/tests/functional/table/create/test_02.py similarity index 100% rename from tests/functional/table/create/02_test.py rename to tests/functional/table/create/test_02.py diff --git a/tests/functional/table/create/03_test.py b/tests/functional/table/create/test_03.py similarity index 100% rename from tests/functional/table/create/03_test.py rename to tests/functional/table/create/test_03.py diff --git a/tests/functional/table/create/04_test.py b/tests/functional/table/create/test_04.py similarity index 100% rename from tests/functional/table/create/04_test.py rename to tests/functional/table/create/test_04.py diff --git a/tests/functional/table/create/05_test.py b/tests/functional/table/create/test_05.py similarity index 100% rename from tests/functional/table/create/05_test.py rename to tests/functional/table/create/test_05.py diff --git a/tests/functional/table/create/06_test.py b/tests/functional/table/create/test_06.py similarity index 100% rename from tests/functional/table/create/06_test.py rename to tests/functional/table/create/test_06.py diff --git a/tests/functional/table/create/07_test.py b/tests/functional/table/create/test_07.py similarity index 100% rename from tests/functional/table/create/07_test.py rename to tests/functional/table/create/test_07.py diff --git a/tests/functional/tabloid/arithmetic_cast_float_to_int_as_round_test.py b/tests/functional/tabloid/test_arithmetic_cast_float_to_int_as_round.py similarity index 100% rename from tests/functional/tabloid/arithmetic_cast_float_to_int_as_round_test.py rename to tests/functional/tabloid/test_arithmetic_cast_float_to_int_as_round.py diff --git a/tests/functional/tabloid/arithmetic_numexpr_eval_dialect_1_test.py b/tests/functional/tabloid/test_arithmetic_numexpr_eval_dialect_1.py similarity index 100% rename from tests/functional/tabloid/arithmetic_numexpr_eval_dialect_1_test.py rename to tests/functional/tabloid/test_arithmetic_numexpr_eval_dialect_1.py diff --git a/tests/functional/tabloid/arithmetic_numexpr_eval_dialect_3_test.py b/tests/functional/tabloid/test_arithmetic_numexpr_eval_dialect_3.py similarity index 100% rename from tests/functional/tabloid/arithmetic_numexpr_eval_dialect_3_test.py rename to tests/functional/tabloid/test_arithmetic_numexpr_eval_dialect_3.py diff --git a/tests/functional/tabloid/bus_3103_windowed_funcs_test.py b/tests/functional/tabloid/test_bus_3103_windowed_funcs.py similarity index 100% rename from tests/functional/tabloid/bus_3103_windowed_funcs_test.py rename to tests/functional/tabloid/test_bus_3103_windowed_funcs.py diff --git a/tests/functional/tabloid/comment_in_object_names_test.py b/tests/functional/tabloid/test_comment_in_object_names.py similarity index 100% rename from tests/functional/tabloid/comment_in_object_names_test.py rename to tests/functional/tabloid/test_comment_in_object_names.py diff --git a/tests/functional/tabloid/dbp_0951_multiple_nested_cte_test.py b/tests/functional/tabloid/test_dbp_0951_multiple_nested_cte.py similarity index 100% rename from tests/functional/tabloid/dbp_0951_multiple_nested_cte_test.py rename to tests/functional/tabloid/test_dbp_0951_multiple_nested_cte.py diff --git a/tests/functional/tabloid/dbp_1697_windowed_funcs_test.py b/tests/functional/tabloid/test_dbp_1697_windowed_funcs.py similarity index 100% rename from tests/functional/tabloid/dbp_1697_windowed_funcs_test.py rename to tests/functional/tabloid/test_dbp_1697_windowed_funcs.py diff --git a/tests/functional/tabloid/dbp_1940_20040130_1740_test.py b/tests/functional/tabloid/test_dbp_1940_20040130_1740.py similarity index 100% rename from tests/functional/tabloid/dbp_1940_20040130_1740_test.py rename to tests/functional/tabloid/test_dbp_1940_20040130_1740.py diff --git a/tests/functional/tabloid/dbp_1940_20061108_2141_test.py b/tests/functional/tabloid/test_dbp_1940_20061108_2141.py similarity index 100% rename from tests/functional/tabloid/dbp_1940_20061108_2141_test.py rename to tests/functional/tabloid/test_dbp_1940_20061108_2141.py diff --git a/tests/functional/tabloid/dbp_1940_20080912_1005_test.py b/tests/functional/tabloid/test_dbp_1940_20080912_1005.py similarity index 100% rename from tests/functional/tabloid/dbp_1940_20080912_1005_test.py rename to tests/functional/tabloid/test_dbp_1940_20080912_1005.py diff --git a/tests/functional/tabloid/dbp_1940_20090521_1520_test.py b/tests/functional/tabloid/test_dbp_1940_20090521_1520.py similarity index 100% rename from tests/functional/tabloid/dbp_1940_20090521_1520_test.py rename to tests/functional/tabloid/test_dbp_1940_20090521_1520.py diff --git a/tests/functional/tabloid/dbp_1940_20110426_1906_test.py b/tests/functional/tabloid/test_dbp_1940_20110426_1906.py similarity index 100% rename from tests/functional/tabloid/dbp_1940_20110426_1906_test.py rename to tests/functional/tabloid/test_dbp_1940_20110426_1906.py diff --git a/tests/functional/tabloid/dbp_1940_20110725_1159_test.py b/tests/functional/tabloid/test_dbp_1940_20110725_1159.py similarity index 100% rename from tests/functional/tabloid/dbp_1940_20110725_1159_test.py rename to tests/functional/tabloid/test_dbp_1940_20110725_1159.py diff --git a/tests/functional/tabloid/dbp_1940_20130412_1008_test.py b/tests/functional/tabloid/test_dbp_1940_20130412_1008.py similarity index 100% rename from tests/functional/tabloid/dbp_1940_20130412_1008_test.py rename to tests/functional/tabloid/test_dbp_1940_20130412_1008.py diff --git a/tests/functional/tabloid/dbp_1940_20130831_2039_test.py b/tests/functional/tabloid/test_dbp_1940_20130831_2039.py similarity index 100% rename from tests/functional/tabloid/dbp_1940_20130831_2039_test.py rename to tests/functional/tabloid/test_dbp_1940_20130831_2039.py diff --git a/tests/functional/tabloid/dbp_1940_20130912_1908_test.py b/tests/functional/tabloid/test_dbp_1940_20130912_1908.py similarity index 100% rename from tests/functional/tabloid/dbp_1940_20130912_1908_test.py rename to tests/functional/tabloid/test_dbp_1940_20130912_1908.py diff --git a/tests/functional/tabloid/dbp_2146_distinct_not_in_test.py b/tests/functional/tabloid/test_dbp_2146_distinct_not_in.py similarity index 100% rename from tests/functional/tabloid/dbp_2146_distinct_not_in_test.py rename to tests/functional/tabloid/test_dbp_2146_distinct_not_in.py diff --git a/tests/functional/tabloid/dbp_4137_combo_full_join_and_windowed_funcs_test.py b/tests/functional/tabloid/test_dbp_4137_combo_full_join_and_windowed_funcs.py similarity index 100% rename from tests/functional/tabloid/dbp_4137_combo_full_join_and_windowed_funcs_test.py rename to tests/functional/tabloid/test_dbp_4137_combo_full_join_and_windowed_funcs.py diff --git a/tests/functional/tabloid/dbp_4391_combo_full_join_and_windowed_funcs_test.py b/tests/functional/tabloid/test_dbp_4391_combo_full_join_and_windowed_funcs.py similarity index 100% rename from tests/functional/tabloid/dbp_4391_combo_full_join_and_windowed_funcs_test.py rename to tests/functional/tabloid/test_dbp_4391_combo_full_join_and_windowed_funcs.py diff --git a/tests/functional/tabloid/dbp_4391_combo_full_join_and_windowed_funcs2_test.py b/tests/functional/tabloid/test_dbp_4391_combo_full_join_and_windowed_funcs2.py similarity index 100% rename from tests/functional/tabloid/dbp_4391_combo_full_join_and_windowed_funcs2_test.py rename to tests/functional/tabloid/test_dbp_4391_combo_full_join_and_windowed_funcs2.py diff --git a/tests/functional/tabloid/dbp_5125_windowed_funcs_test.py b/tests/functional/tabloid/test_dbp_5125_windowed_funcs.py similarity index 100% rename from tests/functional/tabloid/dbp_5125_windowed_funcs_test.py rename to tests/functional/tabloid/test_dbp_5125_windowed_funcs.py diff --git a/tests/functional/tabloid/dbp_7029_heavy_test_for_windowed_funcs_test.py b/tests/functional/tabloid/test_dbp_7029_heavy_test_for_windowed_funcs.py similarity index 100% rename from tests/functional/tabloid/dbp_7029_heavy_test_for_windowed_funcs_test.py rename to tests/functional/tabloid/test_dbp_7029_heavy_test_for_windowed_funcs.py diff --git a/tests/functional/tabloid/dbp_7114_windowed_funcs_test.py b/tests/functional/tabloid/test_dbp_7114_windowed_funcs.py similarity index 100% rename from tests/functional/tabloid/dbp_7114_windowed_funcs_test.py rename to tests/functional/tabloid/test_dbp_7114_windowed_funcs.py diff --git a/tests/functional/tabloid/dml_privileges_sufficiency_test.py b/tests/functional/tabloid/test_dml_privileges_sufficiency.py similarity index 100% rename from tests/functional/tabloid/dml_privileges_sufficiency_test.py rename to tests/functional/tabloid/test_dml_privileges_sufficiency.py diff --git a/tests/functional/tabloid/eqc_136030_test.py b/tests/functional/tabloid/test_eqc_136030.py similarity index 100% rename from tests/functional/tabloid/eqc_136030_test.py rename to tests/functional/tabloid/test_eqc_136030.py diff --git a/tests/functional/tabloid/eqc_141347_test.py b/tests/functional/tabloid/test_eqc_141347.py similarity index 100% rename from tests/functional/tabloid/eqc_141347_test.py rename to tests/functional/tabloid/test_eqc_141347.py diff --git a/tests/functional/tabloid/eqc_160757_test.py b/tests/functional/tabloid/test_eqc_160757.py similarity index 100% rename from tests/functional/tabloid/eqc_160757_test.py rename to tests/functional/tabloid/test_eqc_160757.py diff --git a/tests/functional/tabloid/eqc_166663_test.py b/tests/functional/tabloid/test_eqc_166663.py similarity index 100% rename from tests/functional/tabloid/eqc_166663_test.py rename to tests/functional/tabloid/test_eqc_166663.py diff --git a/tests/functional/tabloid/eqc_200762_test.py b/tests/functional/tabloid/test_eqc_200762.py similarity index 100% rename from tests/functional/tabloid/eqc_200762_test.py rename to tests/functional/tabloid/test_eqc_200762.py diff --git a/tests/functional/tabloid/eqc_306263_test.py b/tests/functional/tabloid/test_eqc_306263.py similarity index 100% rename from tests/functional/tabloid/eqc_306263_test.py rename to tests/functional/tabloid/test_eqc_306263.py diff --git a/tests/functional/tabloid/eqc_343715_test.py b/tests/functional/tabloid/test_eqc_343715.py similarity index 100% rename from tests/functional/tabloid/eqc_343715_test.py rename to tests/functional/tabloid/test_eqc_343715.py diff --git a/tests/functional/tabloid/eqc_344124_test.py b/tests/functional/tabloid/test_eqc_344124.py similarity index 100% rename from tests/functional/tabloid/eqc_344124_test.py rename to tests/functional/tabloid/test_eqc_344124.py diff --git a/tests/functional/tabloid/gtcs_proc_isql_14_test.py b/tests/functional/tabloid/test_gtcs_proc_isql_14.py similarity index 100% rename from tests/functional/tabloid/gtcs_proc_isql_14_test.py rename to tests/functional/tabloid/test_gtcs_proc_isql_14.py diff --git a/tests/functional/tabloid/join_on_position_function_result_test.py b/tests/functional/tabloid/test_join_on_position_function_result.py similarity index 100% rename from tests/functional/tabloid/join_on_position_function_result_test.py rename to tests/functional/tabloid/test_join_on_position_function_result.py diff --git a/tests/functional/tabloid/join_transformation_001_test.py b/tests/functional/tabloid/test_join_transformation_001.py similarity index 100% rename from tests/functional/tabloid/join_transformation_001_test.py rename to tests/functional/tabloid/test_join_transformation_001.py diff --git a/tests/functional/tabloid/join_transformation_002_test.py b/tests/functional/tabloid/test_join_transformation_002.py similarity index 100% rename from tests/functional/tabloid/join_transformation_002_test.py rename to tests/functional/tabloid/test_join_transformation_002.py diff --git a/tests/functional/tabloid/join_transformation_003_test.py b/tests/functional/tabloid/test_join_transformation_003.py similarity index 100% rename from tests/functional/tabloid/join_transformation_003_test.py rename to tests/functional/tabloid/test_join_transformation_003.py diff --git a/tests/functional/tabloid/join_transformation_004_test.py b/tests/functional/tabloid/test_join_transformation_004.py similarity index 100% rename from tests/functional/tabloid/join_transformation_004_test.py rename to tests/functional/tabloid/test_join_transformation_004.py diff --git a/tests/functional/tabloid/join_transformation_005_test.py b/tests/functional/tabloid/test_join_transformation_005.py similarity index 100% rename from tests/functional/tabloid/join_transformation_005_test.py rename to tests/functional/tabloid/test_join_transformation_005.py diff --git a/tests/functional/tabloid/join_transformation_006_test.py b/tests/functional/tabloid/test_join_transformation_006.py similarity index 100% rename from tests/functional/tabloid/join_transformation_006_test.py rename to tests/functional/tabloid/test_join_transformation_006.py diff --git a/tests/functional/tabloid/join_transformation_007_test.py b/tests/functional/tabloid/test_join_transformation_007.py similarity index 100% rename from tests/functional/tabloid/join_transformation_007_test.py rename to tests/functional/tabloid/test_join_transformation_007.py diff --git a/tests/functional/tabloid/join_transformation_008_test.py b/tests/functional/tabloid/test_join_transformation_008.py similarity index 100% rename from tests/functional/tabloid/join_transformation_008_test.py rename to tests/functional/tabloid/test_join_transformation_008.py diff --git a/tests/functional/tabloid/loose_record_when_relief_where_expr_test.py b/tests/functional/tabloid/test_loose_record_when_relief_where_expr.py similarity index 100% rename from tests/functional/tabloid/loose_record_when_relief_where_expr_test.py rename to tests/functional/tabloid/test_loose_record_when_relief_where_expr.py diff --git a/tests/functional/tabloid/max_path_length_test.py b/tests/functional/tabloid/test_max_path_length.py similarity index 100% rename from tests/functional/tabloid/max_path_length_test.py rename to tests/functional/tabloid/test_max_path_length.py diff --git a/tests/functional/tabloid/no_dups_in_call_stack_test.py b/tests/functional/tabloid/test_no_dups_in_call_stack.py similarity index 100% rename from tests/functional/tabloid/no_dups_in_call_stack_test.py rename to tests/functional/tabloid/test_no_dups_in_call_stack.py diff --git a/tests/functional/tabloid/oltp_emul_30_compiler_check_test.py b/tests/functional/tabloid/test_oltp_emul_30_compiler_check.py similarity index 100% rename from tests/functional/tabloid/oltp_emul_30_compiler_check_test.py rename to tests/functional/tabloid/test_oltp_emul_30_compiler_check.py diff --git a/tests/functional/tabloid/optimizer_index_navigation_test.py b/tests/functional/tabloid/test_optimizer_index_navigation.py similarity index 100% rename from tests/functional/tabloid/optimizer_index_navigation_test.py rename to tests/functional/tabloid/test_optimizer_index_navigation.py diff --git a/tests/functional/tabloid/ora_4475843_test.py b/tests/functional/tabloid/test_ora_4475843.py similarity index 100% rename from tests/functional/tabloid/ora_4475843_test.py rename to tests/functional/tabloid/test_ora_4475843.py diff --git a/tests/functional/tabloid/pg_13918_test.py b/tests/functional/tabloid/test_pg_13918.py similarity index 100% rename from tests/functional/tabloid/pg_13918_test.py rename to tests/functional/tabloid/test_pg_13918.py diff --git a/tests/functional/tabloid/pg_14105_test.py b/tests/functional/tabloid/test_pg_14105.py similarity index 100% rename from tests/functional/tabloid/pg_14105_test.py rename to tests/functional/tabloid/test_pg_14105.py diff --git a/tests/functional/tabloid/pg_14421_test.py b/tests/functional/tabloid/test_pg_14421.py similarity index 100% rename from tests/functional/tabloid/pg_14421_test.py rename to tests/functional/tabloid/test_pg_14421.py diff --git a/tests/functional/tabloid/remote_access_to_security_db_test.py b/tests/functional/tabloid/test_remote_access_to_security_db.py similarity index 100% rename from tests/functional/tabloid/remote_access_to_security_db_test.py rename to tests/functional/tabloid/test_remote_access_to_security_db.py diff --git a/tests/functional/tabloid/request_of_expr_index_test.py b/tests/functional/tabloid/test_request_of_expr_index.py similarity index 100% rename from tests/functional/tabloid/request_of_expr_index_test.py rename to tests/functional/tabloid/test_request_of_expr_index.py diff --git a/tests/functional/tabloid/snd_7795_20120706_1249_test.py b/tests/functional/tabloid/test_snd_7795_20120706_1249.py similarity index 100% rename from tests/functional/tabloid/snd_7795_20120706_1249_test.py rename to tests/functional/tabloid/test_snd_7795_20120706_1249.py diff --git a/tests/functional/transactions/read_consist_statement_delete_undone_01_test.py b/tests/functional/transactions/test_read_consist_statement_delete_undone_01.py similarity index 100% rename from tests/functional/transactions/read_consist_statement_delete_undone_01_test.py rename to tests/functional/transactions/test_read_consist_statement_delete_undone_01.py diff --git a/tests/functional/transactions/read_consist_statement_delete_undone_02_test.py b/tests/functional/transactions/test_read_consist_statement_delete_undone_02.py similarity index 100% rename from tests/functional/transactions/read_consist_statement_delete_undone_02_test.py rename to tests/functional/transactions/test_read_consist_statement_delete_undone_02.py diff --git a/tests/functional/transactions/read_consist_sttm_merge_deny_multiple_matches_test.py b/tests/functional/transactions/test_read_consist_sttm_merge_deny_multiple_matches.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_merge_deny_multiple_matches_test.py rename to tests/functional/transactions/test_read_consist_sttm_merge_deny_multiple_matches.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_max_limit_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_max_limit.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_max_limit_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_max_limit.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_delete_01_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_delete_01.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_delete_01_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_delete_01.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_delete_02_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_delete_02.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_delete_02_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_delete_02.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_delete_03_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_delete_03.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_delete_03_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_delete_03.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_delete_04_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_delete_04.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_delete_04_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_delete_04.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_merge_01_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_merge_01.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_merge_01_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_merge_01.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_merge_02_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_merge_02.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_merge_02_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_merge_02.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_merge_03_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_merge_03.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_merge_03_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_merge_03.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_merge_04_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_merge_04.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_merge_04_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_merge_04.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_update_01_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_update_01.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_update_01_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_update_01.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_update_02_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_update_02.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_update_02_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_update_02.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_update_03_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_update_03.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_update_03_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_update_03.py diff --git a/tests/functional/transactions/read_consist_sttm_restart_on_update_04_test.py b/tests/functional/transactions/test_read_consist_sttm_restart_on_update_04.py similarity index 100% rename from tests/functional/transactions/read_consist_sttm_restart_on_update_04_test.py rename to tests/functional/transactions/test_read_consist_sttm_restart_on_update_04.py diff --git a/tests/functional/trigger/alter/01_test.py b/tests/functional/trigger/alter/test_01.py similarity index 100% rename from tests/functional/trigger/alter/01_test.py rename to tests/functional/trigger/alter/test_01.py diff --git a/tests/functional/trigger/alter/02_test.py b/tests/functional/trigger/alter/test_02.py similarity index 100% rename from tests/functional/trigger/alter/02_test.py rename to tests/functional/trigger/alter/test_02.py diff --git a/tests/functional/trigger/alter/03_test.py b/tests/functional/trigger/alter/test_03.py similarity index 100% rename from tests/functional/trigger/alter/03_test.py rename to tests/functional/trigger/alter/test_03.py diff --git a/tests/functional/trigger/alter/04_test.py b/tests/functional/trigger/alter/test_04.py similarity index 100% rename from tests/functional/trigger/alter/04_test.py rename to tests/functional/trigger/alter/test_04.py diff --git a/tests/functional/trigger/alter/05_test.py b/tests/functional/trigger/alter/test_05.py similarity index 100% rename from tests/functional/trigger/alter/05_test.py rename to tests/functional/trigger/alter/test_05.py diff --git a/tests/functional/trigger/alter/06_test.py b/tests/functional/trigger/alter/test_06.py similarity index 100% rename from tests/functional/trigger/alter/06_test.py rename to tests/functional/trigger/alter/test_06.py diff --git a/tests/functional/trigger/alter/07_test.py b/tests/functional/trigger/alter/test_07.py similarity index 100% rename from tests/functional/trigger/alter/07_test.py rename to tests/functional/trigger/alter/test_07.py diff --git a/tests/functional/trigger/alter/08_test.py b/tests/functional/trigger/alter/test_08.py similarity index 100% rename from tests/functional/trigger/alter/08_test.py rename to tests/functional/trigger/alter/test_08.py diff --git a/tests/functional/trigger/alter/09_test.py b/tests/functional/trigger/alter/test_09.py similarity index 100% rename from tests/functional/trigger/alter/09_test.py rename to tests/functional/trigger/alter/test_09.py diff --git a/tests/functional/trigger/alter/10_test.py b/tests/functional/trigger/alter/test_10.py similarity index 100% rename from tests/functional/trigger/alter/10_test.py rename to tests/functional/trigger/alter/test_10.py diff --git a/tests/functional/trigger/alter/11_test.py b/tests/functional/trigger/alter/test_11.py similarity index 100% rename from tests/functional/trigger/alter/11_test.py rename to tests/functional/trigger/alter/test_11.py diff --git a/tests/functional/trigger/create/01_test.py b/tests/functional/trigger/create/test_01.py similarity index 100% rename from tests/functional/trigger/create/01_test.py rename to tests/functional/trigger/create/test_01.py diff --git a/tests/functional/trigger/create/02_test.py b/tests/functional/trigger/create/test_02.py similarity index 100% rename from tests/functional/trigger/create/02_test.py rename to tests/functional/trigger/create/test_02.py diff --git a/tests/functional/trigger/create/03_test.py b/tests/functional/trigger/create/test_03.py similarity index 100% rename from tests/functional/trigger/create/03_test.py rename to tests/functional/trigger/create/test_03.py diff --git a/tests/functional/trigger/create/04_test.py b/tests/functional/trigger/create/test_04.py similarity index 100% rename from tests/functional/trigger/create/04_test.py rename to tests/functional/trigger/create/test_04.py diff --git a/tests/functional/trigger/create/05_test.py b/tests/functional/trigger/create/test_05.py similarity index 100% rename from tests/functional/trigger/create/05_test.py rename to tests/functional/trigger/create/test_05.py diff --git a/tests/functional/trigger/create/06_test.py b/tests/functional/trigger/create/test_06.py similarity index 100% rename from tests/functional/trigger/create/06_test.py rename to tests/functional/trigger/create/test_06.py diff --git a/tests/functional/trigger/create/07_test.py b/tests/functional/trigger/create/test_07.py similarity index 100% rename from tests/functional/trigger/create/07_test.py rename to tests/functional/trigger/create/test_07.py diff --git a/tests/functional/trigger/create/08_test.py b/tests/functional/trigger/create/test_08.py similarity index 100% rename from tests/functional/trigger/create/08_test.py rename to tests/functional/trigger/create/test_08.py diff --git a/tests/functional/trigger/create/09_test.py b/tests/functional/trigger/create/test_09.py similarity index 100% rename from tests/functional/trigger/create/09_test.py rename to tests/functional/trigger/create/test_09.py diff --git a/tests/functional/trigger/create/10_test.py b/tests/functional/trigger/create/test_10.py similarity index 100% rename from tests/functional/trigger/create/10_test.py rename to tests/functional/trigger/create/test_10.py diff --git a/tests/functional/trigger/create/17_test.py b/tests/functional/trigger/create/test_17.py similarity index 100% rename from tests/functional/trigger/create/17_test.py rename to tests/functional/trigger/create/test_17.py diff --git a/tests/functional/trigger/database/connect_01_test.py b/tests/functional/trigger/database/test_connect_01.py similarity index 100% rename from tests/functional/trigger/database/connect_01_test.py rename to tests/functional/trigger/database/test_connect_01.py diff --git a/tests/functional/trigger/database/connect_02_test.py b/tests/functional/trigger/database/test_connect_02.py similarity index 100% rename from tests/functional/trigger/database/connect_02_test.py rename to tests/functional/trigger/database/test_connect_02.py diff --git a/tests/functional/trigger/database/connect_03_test.py b/tests/functional/trigger/database/test_connect_03.py similarity index 100% rename from tests/functional/trigger/database/connect_03_test.py rename to tests/functional/trigger/database/test_connect_03.py diff --git a/tests/functional/trigger/database/connect_04_test.py b/tests/functional/trigger/database/test_connect_04.py similarity index 100% rename from tests/functional/trigger/database/connect_04_test.py rename to tests/functional/trigger/database/test_connect_04.py diff --git a/tests/functional/trigger/database/disconnect_01_test.py b/tests/functional/trigger/database/test_disconnect_01.py similarity index 100% rename from tests/functional/trigger/database/disconnect_01_test.py rename to tests/functional/trigger/database/test_disconnect_01.py diff --git a/tests/functional/trigger/database/transaction_start_multiple_with_normal_finish_test.py b/tests/functional/trigger/database/test_transaction_start_multiple_with_normal_finish.py similarity index 100% rename from tests/functional/trigger/database/transaction_start_multiple_with_normal_finish_test.py rename to tests/functional/trigger/database/test_transaction_start_multiple_with_normal_finish.py diff --git a/tests/functional/trigger/database/transactioncommit_01_test.py b/tests/functional/trigger/database/test_transactioncommit_01.py similarity index 100% rename from tests/functional/trigger/database/transactioncommit_01_test.py rename to tests/functional/trigger/database/test_transactioncommit_01.py diff --git a/tests/functional/trigger/database/transactionrollback_01_test.py b/tests/functional/trigger/database/test_transactionrollback_01.py similarity index 100% rename from tests/functional/trigger/database/transactionrollback_01_test.py rename to tests/functional/trigger/database/test_transactionrollback_01.py diff --git a/tests/functional/trigger/database/transactionstart_01_test.py b/tests/functional/trigger/database/test_transactionstart_01.py similarity index 100% rename from tests/functional/trigger/database/transactionstart_01_test.py rename to tests/functional/trigger/database/test_transactionstart_01.py diff --git a/tests/functional/trigger/table/alter_12_test.py b/tests/functional/trigger/table/test_alter_12.py similarity index 100% rename from tests/functional/trigger/table/alter_12_test.py rename to tests/functional/trigger/table/test_alter_12.py diff --git a/tests/functional/trigger/table/alter_13_test.py b/tests/functional/trigger/table/test_alter_13.py similarity index 100% rename from tests/functional/trigger/table/alter_13_test.py rename to tests/functional/trigger/table/test_alter_13.py diff --git a/tests/functional/util/gbak_zip_test.py b/tests/functional/util/test_gbak_zip.py similarity index 100% rename from tests/functional/util/gbak_zip_test.py rename to tests/functional/util/test_gbak_zip.py diff --git a/tests/functional/view/create/01_test.py b/tests/functional/view/create/test_01.py similarity index 100% rename from tests/functional/view/create/01_test.py rename to tests/functional/view/create/test_01.py diff --git a/tests/functional/view/create/02_test.py b/tests/functional/view/create/test_02.py similarity index 100% rename from tests/functional/view/create/02_test.py rename to tests/functional/view/create/test_02.py diff --git a/tests/functional/view/create/03_test.py b/tests/functional/view/create/test_03.py similarity index 100% rename from tests/functional/view/create/03_test.py rename to tests/functional/view/create/test_03.py diff --git a/tests/functional/view/create/04_test.py b/tests/functional/view/create/test_04.py similarity index 100% rename from tests/functional/view/create/04_test.py rename to tests/functional/view/create/test_04.py diff --git a/tests/functional/view/create/05_test.py b/tests/functional/view/create/test_05.py similarity index 100% rename from tests/functional/view/create/05_test.py rename to tests/functional/view/create/test_05.py diff --git a/tests/functional/view/create/06_test.py b/tests/functional/view/create/test_06.py similarity index 100% rename from tests/functional/view/create/06_test.py rename to tests/functional/view/create/test_06.py diff --git a/tests/functional/view/create/07_test.py b/tests/functional/view/create/test_07.py similarity index 100% rename from tests/functional/view/create/07_test.py rename to tests/functional/view/create/test_07.py diff --git a/tests/functional/view/create/08_test.py b/tests/functional/view/create/test_08.py similarity index 100% rename from tests/functional/view/create/08_test.py rename to tests/functional/view/create/test_08.py diff --git a/tests/functional/view/create/10_test.py b/tests/functional/view/create/test_10.py similarity index 100% rename from tests/functional/view/create/10_test.py rename to tests/functional/view/create/test_10.py diff --git a/tests/full_join_push_where_predicate_test.py b/tests/test_full_join_push_where_predicate.py similarity index 100% rename from tests/full_join_push_where_predicate_test.py rename to tests/test_full_join_push_where_predicate.py