diff --git a/spring-hibernate4/src/test/java/hibernate.cfg.xml b/spring-hibernate4/src/test/java/hibernate.cfg.xml
index 3c4e53efb8..b073f6e3e6 100644
--- a/spring-hibernate4/src/test/java/hibernate.cfg.xml
+++ b/spring-hibernate4/src/test/java/hibernate.cfg.xml
@@ -7,31 +7,31 @@
 
 <hibernate-configuration>
     <session-factory>
-    <!-- Database connection settings -->
-<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
-<property name="connection.url">jdbc:mysql://localhost:3306/spring_hibernate4_01?createDatabaseIfNotExist=true</property>
-<property name="connection.username">tutorialuser</property>
-<property name="connection.password">tutorialmy5ql</property>
- 
-<!-- JDBC connection pool (use the built-in) -->
-<property name="connection.pool_size">1</property>
- 
-<!-- SQL dialect -->
-<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
- 
-<!-- Enable Hibernate's automatic session context management -->
-<property name="current_session_context_class">thread</property>
- 
-<!-- Disable the second-level cache  -->
-<property name="cache.provider_class">org.hibernate.cache.internal.NoCacheProvider</property>
- 
-<!-- Echo all executed SQL to stdout -->
-<property name="show_sql">true</property>
+        <!-- Database connection settings -->
+        <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+        <property name="connection.url">jdbc:mysql://localhost:3306/spring_hibernate4_01?createDatabaseIfNotExist=true</property>
+        <property name="connection.username">tutorialuser</property>
+        <property name="connection.password">tutorialmy5ql</property>
 
-<!-- Drop and re-create the database schema on startup -->
+        <!-- JDBC connection pool (use the built-in) -->
+        <property name="connection.pool_size">1</property>
 
-<mapping resource="org//baeldung//persistence//model//Foo.hbm.xml"/>
-<mapping resource="org//baeldung//persistence//model//Bar.hbm.xml"/>
-</session-factory>
+        <!-- SQL dialect -->
+        <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+
+        <!-- Enable Hibernate's automatic session context management -->
+        <property name="current_session_context_class">thread</property>
+
+        <!-- Disable the second-level cache -->
+        <property name="cache.provider_class">org.hibernate.cache.internal.NoCacheProvider</property>
+
+        <!-- Echo all executed SQL to stdout -->
+        <property name="show_sql">true</property>
+
+        <!-- Drop and re-create the database schema on startup -->
+
+        <mapping resource="org//baeldung//persistence//model//Foo.hbm.xml" />
+        <mapping resource="org//baeldung//persistence//model//Bar.hbm.xml" />
+    </session-factory>
 
 </hibernate-configuration>
diff --git a/spring-hibernate4/src/test/java/org/baeldung/persistence/hibernate/FooSortingPersistenceServiceTest.java b/spring-hibernate4/src/test/java/org/baeldung/persistence/hibernate/FooSortingPersistenceServiceTest.java
index 3c01995dc0..afaa74ea27 100644
--- a/spring-hibernate4/src/test/java/org/baeldung/persistence/hibernate/FooSortingPersistenceServiceTest.java
+++ b/spring-hibernate4/src/test/java/org/baeldung/persistence/hibernate/FooSortingPersistenceServiceTest.java
@@ -1,16 +1,21 @@
 package org.baeldung.persistence.hibernate;
 
+import static org.junit.Assert.assertNull;
+
 import java.util.List;
 import java.util.Set;
 
 import org.baeldung.persistence.model.Bar;
 import org.baeldung.persistence.model.Foo;
 import org.baeldung.spring.PersistenceConfig;
+import org.hibernate.Criteria;
+import org.hibernate.NullPrecedence;
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
+import org.hibernate.criterion.Order;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -21,12 +26,13 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@SuppressWarnings("unchecked")
 public class FooSortingPersistenceServiceTest {
     private SessionFactory sf;
     private Session sess;
 
     @Before
-    public void before() {
+    public final void before() {
         final Configuration configuration = new Configuration().configure();
         final StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties());
         sf = configuration.buildSessionFactory(builder.build());
@@ -36,129 +42,115 @@ public class FooSortingPersistenceServiceTest {
 
     @After
     public void after() {
-        //
+        sess.getTransaction().commit();
     }
 
-    /* @Test
-     public final void whenHQlSortingByOneAttribute_thenPrintSortedResults() {
-         final String hql = "FROM Foo f ORDER BY f.name";
-         final Query query = sess.createQuery(hql);
-         final List<Foo> fooList = query.list();
-         for (final Foo foo : fooList) {
-             System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
-         }
-         sess.getTransaction().commit();
-     }
+    @Test
+    public final void whenHQlSortingByOneAttribute_thenPrintSortedResults() {
+        final String hql = "FROM Foo f ORDER BY f.name";
+        final Query query = sess.createQuery(hql);
+        final List<Foo> fooList = query.list();
+        for (final Foo foo : fooList) {
+            System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
+        }
+    }
 
-     @Test
-     public final void whenHQlSortingByStringNullLast_thenLastNull() {
-         final String hql = "FROM Foo f ORDER BY f.name NULLS LAST";
-         final Query query = sess.createQuery(hql);
-         final List<Foo> fooList = query.list();
-         assertNull(fooList.get(fooList.toArray().length - 1).getName());
-         for (final Foo foo : fooList) {
-             System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
-         }
-         sess.getTransaction().commit();
-     }
+    @Test
+    public final void whenHQlSortingByStringNullLast_thenLastNull() {
+        final String hql = "FROM Foo f ORDER BY f.name NULLS LAST";
+        final Query query = sess.createQuery(hql);
+        final List<Foo> fooList = query.list();
 
-     @Test
-     public final void whenSortingByStringNullsFirst_thenReturnNullsFirst() {
-         final String hql = "FROM Foo f ORDER BY f.name NULLS FIRST";
-         final Query query = sess.createQuery(hql);
-         final List<Foo> fooList = query.list();
-         assertNull(fooList.get(0).getName());
-         for (final Foo foo : fooList) {
-             System.out.println("Name:" + foo.getName());
+        assertNull(fooList.get(fooList.toArray().length - 1).getName());
+        for (final Foo foo : fooList) {
+            System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
+        }
+    }
 
-         }
-         sess.getTransaction().commit();
-     }
+    @Test
+    public final void whenSortingByStringNullsFirst_thenReturnNullsFirst() {
+        final String hql = "FROM Foo f ORDER BY f.name NULLS FIRST";
+        final Query query = sess.createQuery(hql);
+        final List<Foo> fooList = query.list();
+        assertNull(fooList.get(0).getName());
+        for (final Foo foo : fooList) {
+            System.out.println("Name:" + foo.getName());
 
-     @Test
-     public final void whenHQlSortingByOneAttribute_andOrderDirection_thenPrintSortedResults() {
-         final String hql = "FROM Foo f ORDER BY f.name ASC";
-         final Query query = sess.createQuery(hql);
-         final List<Foo> fooList = query.list();
-         for (final Foo foo : fooList) {
-             System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId()
+        }
+    }
 
-                     );
-         }
-         sess.getTransaction().commit();
-     }
+    @Test
+    public final void whenHQlSortingByOneAttribute_andOrderDirection_thenPrintSortedResults() {
+        final String hql = "FROM Foo f ORDER BY f.name ASC";
+        final Query query = sess.createQuery(hql);
+        final List<Foo> fooList = query.list();
+        for (final Foo foo : fooList) {
+            System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
+        }
+    }
 
-     @Test
-     public final void whenHQlSortingByMultipleAttributes_thenSortedResults() {
-         final String hql = "FROM Foo f ORDER BY f.name, f.id";
-         final Query query = sess.createQuery(hql);
-         final List<Foo> fooList = query.list();
-         for (final Foo foo : fooList) {
-             System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId()
+    @Test
+    public final void whenHQlSortingByMultipleAttributes_thenSortedResults() {
+        final String hql = "FROM Foo f ORDER BY f.name, f.id";
+        final Query query = sess.createQuery(hql);
+        final List<Foo> fooList = query.list();
+        for (final Foo foo : fooList) {
+            System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
+        }
+    }
 
-                     );
-         }
-         sess.getTransaction().commit();
-     }
+    @Test
+    public final void whenHQlSortingByMultipleAttributes_andOrderDirection_thenPrintSortedResults() {
+        final String hql = "FROM Foo f ORDER BY f.name DESC, f.id ASC";
+        final Query query = sess.createQuery(hql);
+        final List<Foo> fooList = query.list();
+        for (final Foo foo : fooList) {
+            System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
+        }
+    }
 
-     @Test
-     public final void whenHQlSortingByMultipleAttributes_andOrderDirection_thenPrintSortedResults() {
-         final String hql = "FROM Foo f ORDER BY f.name DESC, f.id ASC";
-         final Query query = sess.createQuery(hql);
-         final List<Foo> fooList = query.list();
-         for (final Foo foo : fooList) {
-             System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
-         }
-         sess.getTransaction().commit();
-     }
+    @Test
+    public final void whenHQLCriteriaSortingByOneAttr_thenPrintSortedResults() {
+        final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
+        criteria.addOrder(Order.asc("id"));
+        final List<Foo> fooList = criteria.list();
+        for (final Foo foo : fooList) {
+            System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
+        }
+    }
 
-     @Test
-     public final void whenHQLCriteriaSortingByOneAttr_thenPrintSortedResults() {
-         final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
-         criteria.addOrder(Order.asc("id"));
-         final List<Foo> fooList = criteria.list();
-         for (final Foo foo : fooList) {
-             System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
-         }
-         sess.getTransaction().commit();
-     }
+    @Test
+    public final void whenHQLCriteriaSortingByMultipAttr_thenSortedResults() {
+        final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
+        criteria.addOrder(Order.asc("name"));
+        criteria.addOrder(Order.asc("id"));
+        final List<Foo> fooList = criteria.list();
+        for (final Foo foo : fooList) {
+            System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
+        }
+    }
 
-     @Test
-     public final void whenHQLCriteriaSortingByMultipAttr_thenSortedResults() {
-         final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
-         criteria.addOrder(Order.asc("name"));
-         criteria.addOrder(Order.asc("id"));
-         final List<Foo> fooList = criteria.list();
-         for (final Foo foo : fooList) {
-             System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
-         }
-         sess.getTransaction().commit();
-     }
+    @Test
+    public final void whenCriteriaSortingStringNullsLastAsc_thenNullsLast() {
+        final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
+        criteria.addOrder(Order.asc("name").nulls(NullPrecedence.LAST));
+        final List<Foo> fooList = criteria.list();
+        assertNull(fooList.get(fooList.toArray().length - 1).getName());
+        for (final Foo foo : fooList) {
+            System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
+        }
+    }
 
-     @Test
-     public final void whenCriteriaSortingStringNullsLastAsc_thenNullsLast() {
-         final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
-         criteria.addOrder(Order.asc("name").nulls(NullPrecedence.LAST));
-         final List<Foo> fooList = criteria.list();
-         assertNull(fooList.get(fooList.toArray().length - 1).getName());
-         for (final Foo foo : fooList) {
-             System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
-         }
-         sess.getTransaction().commit();
-     }
-
-     @Test
-     public final void whenCriteriaSortingStringNullsFirstDesc_thenNullsFirst() {
-         final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
-         criteria.addOrder(Order.desc("name").nulls(NullPrecedence.FIRST));
-         final List<Foo> fooList = criteria.list();
-         assertNull(fooList.get(0).getName());
-         for (final Foo foo : fooList) {
-             System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
-
-         }
-         sess.getTransaction().commit();
-     }*/
+    @Test
+    public final void whenCriteriaSortingStringNullsFirstDesc_thenNullsFirst() {
+        final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
+        criteria.addOrder(Order.desc("name").nulls(NullPrecedence.FIRST));
+        final List<Foo> fooList = criteria.list();
+        assertNull(fooList.get(0).getName());
+        for (final Foo foo : fooList) {
+            System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
+        }
+    }
 
     @Test
     public final void whenSortingBars_thenBarsWithSortedFoos() {
@@ -170,10 +162,8 @@ public class FooSortingPersistenceServiceTest {
             System.out.println("Bar Id:" + bar.getId());
             for (final Foo foo : fooSet) {
                 System.out.println("FooName:" + foo.getName());
-
             }
         }
-        sess.getTransaction().commit();
     }
 
 }