diff --git a/app/src/main/java/ru/project/student/Student.java b/app/src/main/java/ru/project/student/Student.java
index be6fa91..b5d64d2 100644
--- a/app/src/main/java/ru/project/student/Student.java
+++ b/app/src/main/java/ru/project/student/Student.java
@@ -55,8 +55,6 @@ public class Student {
         return new Student(this.groupNumber, this.averageGrade, recordBookNumber);
     }
 
-    }
-
     public static double getMaxAverageGrade() {
         return MAX_AVERAGE_GRADE;
     }
diff --git a/app/src/main/java/ru/project/student/StudentTest.java b/app/src/main/java/ru/project/student/StudentTest.java
deleted file mode 100644
index cdce6d8..0000000
--- a/app/src/main/java/ru/project/student/StudentTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package ru.project.student;
-
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
-class StudentTest {
-
-    @Test
-    void testValidStudentCreation() {
-        Student student = new Student("A12", 4.5, 12345);
-        assertEquals("A12", student.getGroupNumber());
-        assertEquals(4.5, student.getAverageGrade());
-        assertEquals(12345, student.getRecordBookNumber());
-    }
-
-    @Test
-    void testValidGroupNumbers() {
-        assertDoesNotThrow(() -> new Student("A12", 4.5, 1));
-        assertDoesNotThrow(() -> new Student("B32", 4.5, 1));
-        assertDoesNotThrow(() -> new Student("Z00", 4.5, 1));
-    }
-
-    @Test
-    void testInvalidGroupNumbers() {
-        assertThrows(IllegalArgumentException.class, () -> new Student("a12", 4.5, 1));
-        assertThrows(IllegalArgumentException.class, () -> new Student("A1", 4.5, 1));
-        assertThrows(IllegalArgumentException.class, () -> new Student("A123", 4.5, 1));
-        assertThrows(IllegalArgumentException.class, () -> new Student("AA1", 4.5, 1));
-        assertThrows(IllegalArgumentException.class, () -> new Student("а1А", 4.5, 1));
-        assertThrows(IllegalArgumentException.class, () -> new Student("аа!!а123", 4.5, 1));
-        assertThrows(IllegalArgumentException.class, () -> new Student("23фи!12", 4.5, 1));
-        assertThrows(IllegalArgumentException.class, () -> new Student("№№###*()", 4.5, 1));
-    }
-
-    @Test
-    void testValidAverageGrades() {
-        assertDoesNotThrow(() -> new Student("A12", 0.0, 1));
-        assertDoesNotThrow(() -> new Student("A12", 5.0, 1));
-    }
-
-    @Test
-    void testInvalidAverageGrades() {
-        assertThrows(IllegalArgumentException.class, () -> new Student("A12", -1.0, 1));
-        assertThrows(IllegalArgumentException.class, () -> new Student("A12", 6.0, 1));
-    }
-
-    @Test
-    void testValidRecordBookNumbers() {
-        assertDoesNotThrow(() -> new Student("A12", 4.5, 1));
-        assertDoesNotThrow(() -> new Student("A12", 4.5, 12345));
-    }
-
-    @Test
-    void testInvalidRecordBookNumbers() {
-        assertThrows(IllegalArgumentException.class, () -> new Student("A12", 4.5, 0));
-        assertThrows(IllegalArgumentException.class, () -> new Student("A12", 4.5, -1));
-    }
-
-    @Test
-    void testWithGroupNumber() {
-        Student original = new Student("A12", 4.5, 12345);
-        Student updated = original.withGroupNumber("B32");
-
-        assertNotSame(original, updated);
-        assertEquals("B32", updated.getGroupNumber());
-        assertEquals(4.5, updated.getAverageGrade());
-        assertEquals(12345, updated.getRecordBookNumber());
-
-        assertEquals("A12", original.getGroupNumber());
-    }
-
-    @Test
-    void testWithAverageGrade() {
-        Student original = new Student("A12", 4.5, 12345);
-        Student updated = original.withAverageGrade(4.8);
-
-        assertNotSame(original, updated);
-        assertEquals(4.8, updated.getAverageGrade());
-        assertEquals("A12", updated.getGroupNumber());
-        assertEquals(12345, updated.getRecordBookNumber());
-
-        assertEquals(4.5, original.getAverageGrade());
-    }
-
-    @Test
-    void testWithRecordBookNumber() {
-        Student original = new Student("A12", 4.5, 12345);
-        Student updated = original.withRecordBookNumber(99999);
-
-        assertNotSame(original, updated);
-        assertEquals(99999, updated.getRecordBookNumber());
-        assertEquals("A12", updated.getGroupNumber());
-        assertEquals(4.5, updated.getAverageGrade());
-
-        assertEquals(12345, original.getRecordBookNumber());
-    }
-
-    @Test
-    void testWithInvalidGroupNumber() {
-        Student original = new Student("A12", 4.5, 12345);
-        assertThrows(IllegalArgumentException.class,
-                () -> original.withGroupNumber("a12"));
-        assertEquals("A12", original.getGroupNumber()); // не изменился
-    }
-
-    @Test
-    void testWithInvalidAverageGrade() {
-        Student original = new Student("A12", 4.5, 12345);
-        assertThrows(IllegalArgumentException.class,
-                () -> original.withAverageGrade(6.0));
-        assertEquals(4.5, original.getAverageGrade());
-    }
-
-    @Test
-    void testWithInvalidRecordBookNumber() {
-        Student original = new Student("A12", 4.5, 12345);
-        assertThrows(IllegalArgumentException.class,
-                () -> original.withRecordBookNumber(0));
-        assertEquals(12345, original.getRecordBookNumber());
-    }
-
-    @Test
-    void testEqualsAndHashCode() {
-        Student s1 = new Student("A12", 4.5, 12345);
-        Student s2 = new Student("A12", 4.5, 12345);
-        Student s3 = new Student("B32", 4.5, 12345);
-        Student s4 = new Student("A12", 4.8, 12345);
-        Student s5 = new Student("A12", 4.5, 99999);
-
-        assertEquals(s1, s2);
-        assertEquals(s1.hashCode(), s2.hashCode());
-
-        assertNotEquals(s1, s3);
-        assertNotEquals(s1, s4);
-        assertNotEquals(s1, s5);
-        assertNotEquals(s1, null);
-        assertNotEquals(s1, "some string");
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/ru/project/student/StudentTest.java b/app/src/test/java/ru/project/student/StudentTest.java
index e9a7434..09cf2e7 100644
--- a/app/src/test/java/ru/project/student/StudentTest.java
+++ b/app/src/test/java/ru/project/student/StudentTest.java
@@ -2,167 +2,144 @@ package ru.project.student;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
 
 
 class StudentTest {
-    @Test
-    void shouldCreateValidStudent() {
-        Student student = new StudentBuilder()
-                .setGroupNumber("101")
-                .setAverageGrade(4.5)
-                .setRecordBookNumber("12345")
-                .build();
 
-        assertEquals("101", student.getGroupNumber());
+    @Test
+    void testValidStudentCreation() {
+        Student student = new Student("A12", 4.5, 12345);
+        assertEquals("A12", student.getGroupNumber());
         assertEquals(4.5, student.getAverageGrade());
-        assertEquals("12345", student.getRecordBookNumber());
+        assertEquals(12345, student.getRecordBookNumber());
     }
 
     @Test
-    void shouldThrowExceptionWhenGroupNumberIsEmpty() {
-        assertThrows(IllegalArgumentException.class, () -> {
-            new StudentBuilder()
-                    .setGroupNumber("")
-                    .setAverageGrade(4.5)
-                    .setRecordBookNumber("12345")
-                    .build();
-        });
+    void testValidGroupNumbers() {
+        assertDoesNotThrow(() -> new Student("A12", 4.5, 1));
+        assertDoesNotThrow(() -> new Student("B32", 4.5, 1));
+        assertDoesNotThrow(() -> new Student("Z00", 4.5, 1));
     }
 
     @Test
-    void shouldThrowExceptionWhenAverageGradeIsGreaterThanFive() {
-        assertThrows(IllegalArgumentException.class, () -> {
-            new StudentBuilder()
-                    .setGroupNumber("101")
-                    .setAverageGrade(6.0)
-                    .setRecordBookNumber("12345")
-                    .build();
-        });
+    void testInvalidGroupNumbers() {
+        assertThrows(IllegalArgumentException.class, () -> new Student("a12", 4.5, 1));
+        assertThrows(IllegalArgumentException.class, () -> new Student("A1", 4.5, 1));
+        assertThrows(IllegalArgumentException.class, () -> new Student("A123", 4.5, 1));
+        assertThrows(IllegalArgumentException.class, () -> new Student("AA1", 4.5, 1));
+        assertThrows(IllegalArgumentException.class, () -> new Student("а1А", 4.5, 1));
+        assertThrows(IllegalArgumentException.class, () -> new Student("аа!!а123", 4.5, 1));
+        assertThrows(IllegalArgumentException.class, () -> new Student("23фи!12", 4.5, 1));
+        assertThrows(IllegalArgumentException.class, () -> new Student("№№###*()", 4.5, 1));
     }
 
     @Test
-    void shouldThrowExceptionWhenAverageGradeIsLessThanZero() {
-        assertThrows(IllegalArgumentException.class, () -> {
-            new StudentBuilder()
-                    .setGroupNumber("101")
-                    .setAverageGrade(-1.0)
-                    .setRecordBookNumber("12345")
-                    .build();
-        });
+    void testValidAverageGrades() {
+        assertDoesNotThrow(() -> new Student("A12", 0.0, 1));
+        assertDoesNotThrow(() -> new Student("A12", 5.0, 1));
     }
 
     @Test
-    void shouldCreateStudentWhenAverageGradeIsZero() {
-        Student student = new StudentBuilder()
-                .setGroupNumber("101")
-                .setAverageGrade(0.0)
-                .setRecordBookNumber("12345")
-                .build();
-
-        assertEquals(0.0, student.getAverageGrade());
+    void testInvalidAverageGrades() {
+        assertThrows(IllegalArgumentException.class, () -> new Student("A12", -1.0, 1));
+        assertThrows(IllegalArgumentException.class, () -> new Student("A12", 6.0, 1));
     }
 
     @Test
-    void shouldCreateStudentWhenAverageGradeIsFive() {
-        Student student = new StudentBuilder()
-                .setGroupNumber("101")
-                .setAverageGrade(5.0)
-                .setRecordBookNumber("12345")
-                .build();
-
-        assertEquals(5.0, student.getAverageGrade());
+    void testValidRecordBookNumbers() {
+        assertDoesNotThrow(() -> new Student("A12", 4.5, 1));
+        assertDoesNotThrow(() -> new Student("A12", 4.5, 12345));
     }
 
     @Test
-    void shouldThrowExceptionWhenRecordBookNumberIsEmpty() {
-        assertThrows(IllegalArgumentException.class, () -> {
-            new StudentBuilder()
-                    .setGroupNumber("101")
-                    .setAverageGrade(4.5)
-                    .setRecordBookNumber("")
-                    .build();
-        });
+    void testInvalidRecordBookNumbers() {
+        assertThrows(IllegalArgumentException.class, () -> new Student("A12", 4.5, 0));
+        assertThrows(IllegalArgumentException.class, () -> new Student("A12", 4.5, -1));
     }
 
     @Test
-    void shouldThrowExceptionWhenGroupNumberIsNull() {
-        assertThrows(IllegalArgumentException.class, () -> {
-            new StudentBuilder()
-                    .setGroupNumber(null)
-                    .setAverageGrade(4.5)
-                    .setRecordBookNumber("12345")
-                    .build();
-        });
+    void testWithGroupNumber() {
+        Student original = new Student("A12", 4.5, 12345);
+        Student updated = original.withGroupNumber("B32");
+
+        assertNotSame(original, updated);
+        assertEquals("B32", updated.getGroupNumber());
+        assertEquals(4.5, updated.getAverageGrade());
+        assertEquals(12345, updated.getRecordBookNumber());
+
+        assertEquals("A12", original.getGroupNumber());
     }
 
     @Test
-    void shouldThrowExceptionWhenGroupNumberIsBlank() {
-        assertThrows(IllegalArgumentException.class, () -> {
-            new StudentBuilder()
-                    .setGroupNumber("   ")
-                    .setAverageGrade(4.5)
-                    .setRecordBookNumber("12345")
-                    .build();
-        });
+    void testWithAverageGrade() {
+        Student original = new Student("A12", 4.5, 12345);
+        Student updated = original.withAverageGrade(4.8);
+
+        assertNotSame(original, updated);
+        assertEquals(4.8, updated.getAverageGrade());
+        assertEquals("A12", updated.getGroupNumber());
+        assertEquals(12345, updated.getRecordBookNumber());
+
+        assertEquals(4.5, original.getAverageGrade());
     }
 
     @Test
-    void shouldThrowExceptionWhenRecordBookNumberIsNull() {
-        assertThrows(IllegalArgumentException.class, () -> {
-            new StudentBuilder()
-                    .setGroupNumber("101")
-                    .setAverageGrade(4.5)
-                    .setRecordBookNumber(null)
-                    .build();
-        });
+    void testWithRecordBookNumber() {
+        Student original = new Student("A12", 4.5, 12345);
+        Student updated = original.withRecordBookNumber(99999);
+
+        assertNotSame(original, updated);
+        assertEquals(99999, updated.getRecordBookNumber());
+        assertEquals("A12", updated.getGroupNumber());
+        assertEquals(4.5, updated.getAverageGrade());
+
+        assertEquals(12345, original.getRecordBookNumber());
     }
 
     @Test
-    void shouldThrowExceptionWhenRecordBookNumberIsBlank() {
-        assertThrows(IllegalArgumentException.class, () -> {
-            new StudentBuilder()
-                    .setGroupNumber("101")
-                    .setAverageGrade(4.5)
-                    .setRecordBookNumber("   ")
-                    .build();
-        });
+    void testWithInvalidGroupNumber() {
+        Student original = new Student("A12", 4.5, 12345);
+        assertThrows(IllegalArgumentException.class,
+                () -> original.withGroupNumber("a12"));
+        assertEquals("A12", original.getGroupNumber()); // не изменился
     }
 
     @Test
-    void shouldReturnTrueWhenStudentsAreEqual() {
-        Student student1 = new StudentBuilder()
-                .setGroupNumber("101")
-                .setAverageGrade(4.5)
-                .setRecordBookNumber("12345")
-                .build();
-
-        Student student2 = new StudentBuilder()
-                .setGroupNumber("101")
-                .setAverageGrade(4.5)
-                .setRecordBookNumber("12345")
-                .build();
-
-        assertEquals(student1, student2);
-        assertEquals(student1.hashCode(), student2.hashCode());
+    void testWithInvalidAverageGrade() {
+        Student original = new Student("A12", 4.5, 12345);
+        assertThrows(IllegalArgumentException.class,
+                () -> original.withAverageGrade(6.0));
+        assertEquals(4.5, original.getAverageGrade());
     }
 
     @Test
-    void shouldReturnFalseWhenStudentsAreDifferent() {
-        Student student1 = new StudentBuilder()
-                .setGroupNumber("101")
-                .setAverageGrade(4.5)
-                .setRecordBookNumber("12345")
-                .build();
+    void testWithInvalidRecordBookNumber() {
+        Student original = new Student("A12", 4.5, 12345);
+        assertThrows(IllegalArgumentException.class,
+                () -> original.withRecordBookNumber(0));
+        assertEquals(12345, original.getRecordBookNumber());
+    }
 
-        Student student2 = new StudentBuilder()
-                .setGroupNumber("102")
-                .setAverageGrade(4.5)
-                .setRecordBookNumber("12345")
-                .build();
+    @Test
+    void testEqualsAndHashCode() {
+        Student s1 = new Student("A12", 4.5, 12345);
+        Student s2 = new Student("A12", 4.5, 12345);
+        Student s3 = new Student("B32", 4.5, 12345);
+        Student s4 = new Student("A12", 4.8, 12345);
+        Student s5 = new Student("A12", 4.5, 99999);
 
-        assertNotEquals(student1, student2);
+        assertEquals(s1, s2);
+        assertEquals(s1.hashCode(), s2.hashCode());
+
+        assertNotEquals(s1, s3);
+        assertNotEquals(s1, s4);
+        assertNotEquals(s1, s5);
+        assertNotEquals(s1, null);
+        assertNotEquals(s1, "some string");
     }
 }