diff --git a/Jenkinsfile b/Jenkinsfile
index bc8c4fa..7b26dbf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
         }
         stage('Test') {
             steps {
-                sh "./gradlew test"
+                sh "./gradlew clean test --info"
             }
         }
     }
diff --git a/build.gradle b/build.gradle
index 9657951..9d06099 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,6 +61,10 @@ task health(dependsOn: [
         'checkstyleMain'
 ])
 
+test {
+    useJUnitPlatform()
+}
+
 jar {
     enabled = false
 }
@@ -79,7 +83,9 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
+    implementation('org.springframework.boot:spring-boot-starter-web') {
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
+    }
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-aop'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail'
@@ -91,8 +97,6 @@ dependencies {
     implementation group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity6'
     implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner'
     implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-hibernate5'
-    implementation group: 'org.springframework.security', name: 'spring-security-oauth2-client'
-    implementation group: 'org.springframework.security', name: 'spring-security-oauth2-jose'
 
     implementation group: 'org.postgresql', name: 'postgresql', version: '42.2.5'
 
@@ -101,16 +105,16 @@ dependencies {
 
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
 
-    implementation group: 'org.webjars', name: 'bootstrap', version: '4.1.0'
-    implementation group: 'org.webjars', name: 'bootstrap-select', version: '1.13.3'
-    implementation group: 'org.webjars', name: 'jquery', version: '3.3.1-1'
-    implementation group: 'org.webjars.npm', name: 'jquery.easing', version: '1.4.1'
+    implementation group: 'org.webjars', name: 'bootstrap', version: '5.3.3'
+    runtimeOnly group: 'org.webjars', name: 'bootstrap-select', version: '1.4.2'
+    implementation group: 'org.webjars', name: 'jquery', version: '3.7.1'
+    implementation group: 'org.webjars', name: 'jquery-easing', version: '1.4.1'
     implementation group: 'org.webjars', name: 'font-awesome', version: '4.7.0'
 
     implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.8.0'
     implementation group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0'
     implementation group: 'xalan', name: 'xalan', version: '2.7.2'
 
-    testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.2'
 }
diff --git a/src/main/java/ru/ulstu/user/util/UserUtils.java b/src/main/java/ru/ulstu/user/util/UserUtils.java
index 6f51633..bee4a1e 100644
--- a/src/main/java/ru/ulstu/user/util/UserUtils.java
+++ b/src/main/java/ru/ulstu/user/util/UserUtils.java
@@ -4,7 +4,6 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import ru.ulstu.configuration.Constants;
 
 public class UserUtils {
@@ -28,10 +27,6 @@ public class UserUtils {
             final UserDetails springSecurityUser = (UserDetails) authentication.getPrincipal();
             return springSecurityUser.getUsername();
         }
-        if (authentication.getPrincipal() instanceof DefaultOidcUser) {
-            final DefaultOidcUser oauth2User = (DefaultOidcUser) authentication.getPrincipal();
-            return oauth2User.getEmail();
-        }
         if (authentication.getPrincipal() instanceof String) {
             return (String) authentication.getPrincipal();
         }
diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index 9a0e6b0..38c0609 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -156,16 +156,16 @@
                                             <a class="paper-name"
                                                th:href="@{'/papers/paper?id=' + *{papers[__${rowStat.index}__].id} + ''}"
                                                th:if="*{papers[__${rowStat.index}__].id !=null}">
-                                                <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status},
-                                                title=*{papers[__${rowStat.index}__].title}, small=false)"/>
+                                                <span th:replace="~{papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status},
+                                                title=*{papers[__${rowStat.index}__].title}, small=false)}"/>
                                                 <span th:text="*{papers[__${rowStat.index}__].title}">
                                                     Имя статьи
                                                 </span>
                                             </a>
                                             <a class="paper-name"
                                                th:unless="*{papers[__${rowStat.index}__].id !=null}">
-                                                <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status},
-                                                title=*{papers[__${rowStat.index}__].title}, small=false)"/>
+                                                <span th:replace="~{papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status},
+                                                title=*{papers[__${rowStat.index}__].title}, small=false)}"/>
                                                 <span th:text="*{papers[__${rowStat.index}__].title}">
                                                     Имя статьи
                                                 </span>
diff --git a/src/main/resources/templates/grants/fragments/grantDashboardFragment.html b/src/main/resources/templates/grants/fragments/grantDashboardFragment.html
index 09e7e89..63f1da7 100644
--- a/src/main/resources/templates/grants/fragments/grantDashboardFragment.html
+++ b/src/main/resources/templates/grants/fragments/grantDashboardFragment.html
@@ -7,7 +7,7 @@
 <div th:fragment="grantDashboard (grant)" class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
     <div class="row">
         <div class="col-2">
-            <span th:replace="grants/fragments/grantStatusFragment :: grantStatus(grantStatus=${grant.status})"/>
+            <span th:replace="~{grants/fragments/grantStatusFragment :: grantStatus(grantStatus=${grant.status})}"/>
         </div>
         <div class="col col-10 text-right">
             <a th:href="'grant?id='+${grant.id}">
@@ -15,8 +15,8 @@
             </a>
             <p class="text-muted" th:text="${grant.status.statusName}"> status</p>
             <span th:each="paper, rowStat : *{grant.papers}">
-            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status},
-            title=${paper.title}, small=true)"/>
+            <span th:replace="~{papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status},
+            title=${paper.title}, small=true)}"/>
         </span>
         </div>
     </div>
diff --git a/src/main/resources/templates/grants/fragments/grantLineFragment.html b/src/main/resources/templates/grants/fragments/grantLineFragment.html
index 86ae1cf..c215698 100644
--- a/src/main/resources/templates/grants/fragments/grantLineFragment.html
+++ b/src/main/resources/templates/grants/fragments/grantLineFragment.html
@@ -15,8 +15,8 @@
             <span class="text-muted" th:text="${grant.authorsString}"/>
         </a>
         <span th:each="paper, rowStat : *{grant.papers}">
-            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status},
-            title=${paper.title}, small=true)"/>
+            <span th:replace="~{papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status},
+            title=${paper.title}, small=true)}"/>
         </span>
         <input class="id-class" type="hidden" th:value="${grant.id}"/>
         <a class="remove-grant  pull-right d-none" th:href="@{'/grants/delete/'+${grant.id}}"
diff --git a/src/main/resources/templates/papers/dashboard.html b/src/main/resources/templates/papers/dashboard.html
index d02f1be..9f0ab5f 100644
--- a/src/main/resources/templates/papers/dashboard.html
+++ b/src/main/resources/templates/papers/dashboard.html
@@ -11,11 +11,11 @@
         <div class="container">
             <div class="col-lg-12 text-center">
                 <h2 class="section-heading text-uppercase">Статьи</h2>
-                <div th:replace="papers/fragments/paperNavigationFragment"/>
+                <div th:replace="~{papers/fragments/paperNavigationFragment}"/>
             </div>
             <div class="row justify-content-center" id="dashboard">
                 <th:block th:each="paper : ${papers}">
-                    <div th:replace="papers/fragments/paperDashboardFragment :: paperDashboard(paper=${paper})"/>
+                    <div th:replace="~{papers/fragments/paperDashboardFragment :: paperDashboard(paper=${paper})}"/>
                 </th:block>
             </div>
             <div th:replace="fragments/noRecordsFragment :: noRecords(entities=${papers}, noRecordsMessage=' одной статьи', url='paper')"/>
diff --git a/src/main/resources/templates/papers/fragments/paperDashboardFragment.html b/src/main/resources/templates/papers/fragments/paperDashboardFragment.html
index 48b6bae..c5b34e2 100644
--- a/src/main/resources/templates/papers/fragments/paperDashboardFragment.html
+++ b/src/main/resources/templates/papers/fragments/paperDashboardFragment.html
@@ -7,8 +7,8 @@
 <div th:fragment="paperDashboard (paper)" class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
     <div class="row">
         <div class="col-2">
-            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status},
-            title=${paper.title}, small=false)"/>
+            <span th:replace="~{papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status},
+            title=${paper.title}, small=false)}"/>
         </div>
         <div class="col col-10 text-right">
             <p th:if="${paper.url!=null and paper.url!=''}"><a target="_blank" class="externalLink"
diff --git a/src/main/resources/templates/papers/fragments/paperLineFragment.html b/src/main/resources/templates/papers/fragments/paperLineFragment.html
index 88f2f7a..16d91a5 100644
--- a/src/main/resources/templates/papers/fragments/paperLineFragment.html
+++ b/src/main/resources/templates/papers/fragments/paperLineFragment.html
@@ -7,7 +7,7 @@
 <div th:fragment="paperLine (paper)" class="text-left paper-row" style="background-color: white;">
     <div class="row">
         <div class="col-1 d-flex justify-content-center align-self-center">
-            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title}, small=false)"/>
+            <span th:replace="~{papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title}, small=false)}"/>
         </div>
         <div class="col-10">
             <div class="row">
diff --git a/src/main/resources/templates/papers/papers.html b/src/main/resources/templates/papers/papers.html
index f470d23..cbb7f1a 100644
--- a/src/main/resources/templates/papers/papers.html
+++ b/src/main/resources/templates/papers/papers.html
@@ -15,7 +15,7 @@
                 <div class="row mb-3" id="paper-list">
                     <div class="col-lg-12 text-center">
                         <h3 class="section-heading text-uppercase">Статьи</h3>
-                        <div th:replace="papers/fragments/paperNavigationFragment"/>
+                        <div th:replace="~{papers/fragments/paperNavigationFragment}"/>
                     </div>
                 </div>
 
diff --git a/src/test/java/ru/ulstu/StreamApiUtilsTest.java b/src/test/java/ru/ulstu/test/StreamApiUtilsTest.java
similarity index 96%
rename from src/test/java/ru/ulstu/StreamApiUtilsTest.java
rename to src/test/java/ru/ulstu/test/StreamApiUtilsTest.java
index 417628e..cb08287 100644
--- a/src/test/java/ru/ulstu/StreamApiUtilsTest.java
+++ b/src/test/java/ru/ulstu/test/StreamApiUtilsTest.java
@@ -1,4 +1,4 @@
-package ru.ulstu;
+package ru.ulstu.test;
 
 
 import org.junit.jupiter.api.Test;