diff --git a/.gitignore b/.gitignore
index be0a1bf..dffcb3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-lab2/students_test.txt
+lab2/tests/students_test.txt
diff --git a/lab2/test_data_list_student_short.rb b/lab2/test_data_list_student_short.rb
deleted file mode 100644
index a021cf2..0000000
--- a/lab2/test_data_list_student_short.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require_relative 'student_short'
-require_relative 'data_list_student_short'
-
-students = [
-  StudentShort.new(id: '1', surname_initials: 'Иванов И.И.', phone: '+79991112233'),
-  StudentShort.new(id: '2', surname_initials: 'Петров П.П.', telegram: '@petrov'),
-  StudentShort.new(id: '3', surname_initials: 'Сидоров С.С.', email: 'sidorov@mail.ru')
-]
-
-data_list = DataListStudentShort.new(students)
-
-puts "Столбцы: #{data_list.get_names.inspect}"
-
-table = data_list.get_data
-(0...table.rows_count).each do |row|
-  puts (0...table.columns_count).map { |col| table.item(row, col) }.join(' | ')
-end
-
-new_students = [
-  StudentShort.new(id: '4', surname_initials: 'Новиков Н.Н.', phone: '+79994445566'),
-  StudentShort.new(id: '5', surname_initials: 'Кузнецов К.К.', email: 'kuznetsov@example.com')
-]
-
-data_list.items = new_students
-
-puts "\nПосле замены:"
-table = data_list.get_data
-(0...table.rows_count).each do |row|
-  puts (0...table.columns_count).map { |col| table.item(row, col) }.join(' | ')
-end
\ No newline at end of file
diff --git a/lab2/tests/test_data_list_student_short.rb b/lab2/tests/test_data_list_student_short.rb
index 77f2695..c347fb0 100644
--- a/lab2/tests/test_data_list_student_short.rb
+++ b/lab2/tests/test_data_list_student_short.rb
@@ -1,54 +1,30 @@
-require 'minitest/autorun'
-require_relative '../data_list_student_short'
 require_relative '../student_short'
+require_relative '../data_list_student_short'
+
+students = [
+  StudentShort.new(id: '1', surname_initials: 'Иванов И.И.', phone: '+79991112233'),
+  StudentShort.new(id: '2', surname_initials: 'Петров П.П.', telegram: '@petrov'),
+  StudentShort.new(id: '3', surname_initials: 'Сидоров С.С.', email: 'sidorov@mail.ru')
+]
+
+data_list = DataListStudentShort.new(students)
 
-class TestDataListStudentShort < Minitest::Test
-  def setup
-    @students = [
-      StudentShort.new(id: '1', surname_initials: 'Иванов И.И.', phone: '+79991112233'),
-      StudentShort.new(id: '2', surname_initials: 'Петров П.П.', telegram: '@petrov'),
-      StudentShort.new(id: '3', surname_initials: 'Сидоров С.С.', email: 'sidorov@mail.ru')
-    ]
-    @data_list = DataListStudentShort.new(@students)
-  end
+puts "Столбцы: #{data_list.get_names.inspect}"
 
-  def test_get_names
-    assert_equal ['№', 'Фамилия и инициалы', 'Телефон', 'Telegram', 'Email'], 
-                 @data_list.get_names
-  end
+table = data_list.get_data
+(0...table.rows_count).each do |row|
+  puts (0...table.columns_count).map { |col| table.item(row, col) }.join(' | ')
+end
 
-  def test_get_data
-    table = @data_list.get_data
-    
-    assert_equal 3, table.rows_count
-    assert_equal 5, table.columns_count
-    
-    assert_equal 1, table.item(0, 0)
-    assert_equal 'Иванов И.И.', table.item(0, 1)
-    assert_equal '+79991112233', table.item(0, 2)
-    assert_equal '-', table.item(0, 3)
-    assert_equal '-', table.item(0, 4)
-    
-    assert_equal '-', table.item(1, 2)
-    assert_equal '@petrov', table.item(1, 3)
-  end
+new_students = [
+  StudentShort.new(id: '4', surname_initials: 'Новиков Н.Н.', phone: '+79994445566'),
+  StudentShort.new(id: '5', surname_initials: 'Кузнецов К.К.', email: 'kuznetsov@example.com')
+]
 
-  def test_selection_functionality
-    @data_list.select(0)
-    @data_list.select(2)
-    assert_equal [0, 2], @data_list.get_selected
-  end
+data_list.items = new_students
 
-  def test_invalid_data_handling
-    invalid_students = [
-      { id: '1', name: 'Иванов И.И.', phone: '+79991112233' },
-      StudentShort.new(id: '2', surname_initials: 'Петров П.П.', telegram: '@petrov')
-    ]
-    data_list = DataListStudentShort.new(invalid_students)
-    
-    table = data_list.get_data
-    
-    assert_equal 'N/A', table.item(0, 1)
-    assert_equal '-', table.item(0, 3)
-  end
+puts "\nПосле замены:"
+table = data_list.get_data
+(0...table.rows_count).each do |row|
+  puts (0...table.columns_count).map { |col| table.item(row, col) }.join(' | ')
 end
\ No newline at end of file
diff --git a/lab2/test_data_table.rb b/lab2/tests/test_data_table.rb
similarity index 97%
rename from lab2/test_data_table.rb
rename to lab2/tests/test_data_table.rb
index 58c355d..709515c 100644
--- a/lab2/test_data_table.rb
+++ b/lab2/tests/test_data_table.rb
@@ -1,4 +1,4 @@
-require_relative 'data_table'
+require_relative '../data_table'
 
 data = [
   [1, "Alice", 25],
diff --git a/lab2/test_students_list_txt.rb b/lab2/tests/test_students_list_txt.rb
similarity index 96%
rename from lab2/test_students_list_txt.rb
rename to lab2/tests/test_students_list_txt.rb
index 5c17848..1c7397d 100644
--- a/lab2/test_students_list_txt.rb
+++ b/lab2/tests/test_students_list_txt.rb
@@ -1,7 +1,7 @@
 require 'date'
-require_relative 'students_list_txt'
-require_relative 'student'
-require_relative 'student_short'
+require_relative '../students_list_txt'
+require_relative '../student'
+require_relative '../student_short'
 
 def run_tests
   filename = 'students_test.txt'