diff --git a/spring-jms/pom.xml b/spring-jms/pom.xml
index b15c18f991..8e83f82f38 100644
--- a/spring-jms/pom.xml
+++ b/spring-jms/pom.xml
@@ -11,6 +11,7 @@
 	<properties>
 		<springframework.version>4.3.2.RELEASE</springframework.version>
 		<activemq.version>5.12.0</activemq.version>
+		<junit.version>4.12</junit.version>
 	</properties>
 
 	<dependencies>
@@ -29,7 +30,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -58,16 +59,16 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>spring-jms</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+		</plugins>
+		<finalName>spring-jms</finalName>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
index 1ef3902a31..927762f05b 100644
--- a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
@@ -24,10 +24,6 @@ public class SampleJmsMessageSender {
     }
 
     public void sendMessage(final Employee employee) {
-        System.out.println("Jms Message Sender : " + employee);
-        Map<String, Object> map = new HashMap<>();
-        map.put("name", employee.getName());
-        map.put("age", employee.getAge());
-        this.jmsTemplate.convertAndSend(map);
+        this.jmsTemplate.convertAndSend(employee);
     }
 }
diff --git a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
index eb9d51160d..6d4bef5402 100644
--- a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
@@ -5,13 +5,21 @@ import org.springframework.jms.core.JmsTemplate;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
+import javax.jms.Queue;
 import javax.jms.TextMessage;
 import java.util.Map;
 
 public class SampleListener implements MessageListener {
 
-    public JmsTemplate getJmsTemplate() {
-        return getJmsTemplate();
+    private JmsTemplate jmsTemplate;
+    private Queue queue;
+
+    public void setJmsTemplate(JmsTemplate jmsTemplate) {
+        this.jmsTemplate = jmsTemplate;
+    }
+
+    public void setQueue(Queue queue) {
+        this.queue = queue;
     }
 
     public void onMessage(Message message) {
@@ -19,17 +27,14 @@ public class SampleListener implements MessageListener {
             try {
 
                 String msg = ((TextMessage) message).getText();
-                System.out.println("Message has been consumed : " + msg);
             } catch (JMSException ex) {
                 throw new RuntimeException(ex);
             }
-        } else {
-            throw new IllegalArgumentException("Message Error");
         }
     }
 
     public Employee receiveMessage() throws JMSException {
-        Map map = (Map) getJmsTemplate().receiveAndConvert();
+        Map map = (Map) this.jmsTemplate.receiveAndConvert();
         return new Employee((String) map.get("name"), (Integer) map.get("age"));
     }
 }
diff --git a/spring-jms/src/main/resources/EmbeddedActiveMQ.xml b/spring-jms/src/main/resources/EmbeddedActiveMQ.xml
index 6b419c3270..016b07e831 100644
--- a/spring-jms/src/main/resources/EmbeddedActiveMQ.xml
+++ b/spring-jms/src/main/resources/EmbeddedActiveMQ.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:amq="http://activemq.apache.org/schema/core"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd   http://activemq.apache.org/schema/core
-                        http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd">
- 
-    <!-- Embedded ActiveMQ Broker -->
-    <amq:broker id="broker" useJmx="false" persistent="false">
-        <amq:transportConnectors>
-            <amq:transportConnector uri="tcp://localhost:61616" />
-        </amq:transportConnectors>
-    </amq:broker>
- 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:util="http://www.springframework.org/schema/util" xmlns:task="http://www.springframework.org/schema/task"
+	xmlns:amq="http://activemq.apache.org/schema/core"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://activemq.apache.org/schema/core
+                        http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+	<!-- Embedded ActiveMQ Broker -->
+	<amq:broker id="broker" useJmx="false" persistent="false"
+		useShutdownHook="false">
+		<amq:transportConnectors>
+			<amq:transportConnector uri="tcp://localhost:61616" />
+		</amq:transportConnectors>
+	</amq:broker>
 </beans>
diff --git a/spring-jms/src/main/resources/applicationContext.xml b/spring-jms/src/main/resources/applicationContext.xml
index d94eb4c371..28bf848e59 100644
--- a/spring-jms/src/main/resources/applicationContext.xml
+++ b/spring-jms/src/main/resources/applicationContext.xml
@@ -1,34 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+
+	<!-- JmsTemplate Definition -->
+	<bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+		<property name="connectionFactory" ref="connectionFactory" />
+		<property name="defaultDestination" ref="destinationQueue" />
+		<property name="messageConverter" ref="myMessageConverter" />
+	</bean>
+	<bean id="amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+		<constructor-arg index="0" value="tcp://localhost:61616" />
+	</bean>
+
+	<!-- ConnectionFactory Definition -->
+	<bean id="connectionFactory"
+		class="org.springframework.jms.connection.SingleConnectionFactory">
+		<constructor-arg ref="amqConnectionFactory" />
+
+	</bean>
+
 
-	 <bean id="amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
-        <constructor-arg index="0" value="tcp://localhost:61616" />
-    </bean>
- 
-    <!-- ConnectionFactory Definition -->
-    <bean id="connectionFactory"
-        class="org.springframework.jms.connection.CachingConnectionFactory">
-        <constructor-arg ref="amqConnectionFactory" />
-    </bean>
-	
 	<bean id="destinationQueue" class="org.apache.activemq.command.ActiveMQQueue">
-        <constructor-arg index="0" value="IN_QUEUE" />
-    </bean>
- 
-    <!-- JmsTemplate Definition -->
-    <bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
-        <property name="connectionFactory" ref="connectionFactory" />
-        <property name="defaultDestination" ref="destinationQueue" />
-    </bean>
+		<constructor-arg index="0" value="IN_QUEUE" />
+	</bean>
+
+
 	<bean id="SampleJmsMessageSender" class="com.baeldung.spring.jms.SampleJmsMessageSender">
 		<property name="queue" ref="destinationQueue" />
 		<property name="jmsTemplate" ref="jmsTemplate" />
 	</bean>
 
+	<bean id="myMessageConverter" class="com.baeldung.spring.jms.SampleMessageConverter" />
+
 	<!-- this is the Message-Driven POJO (MDP) -->
-	<bean id="messageListener" class="com.baeldung.spring.jms.SampleListener" />
+	<bean id="messageListener" class="com.baeldung.spring.jms.SampleListener">
+		<property name="jmsTemplate" ref="jmsTemplate" />
+		<property name="queue" ref="destinationQueue" />
+	</bean>
+
 
 	<!-- and this is the message listener container -->
 	<bean id="jmsContainer"
diff --git a/spring-jms/src/test/java/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java b/spring-jms/src/test/java/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java
index 117f8bed82..c0761939ad 100644
--- a/spring-jms/src/test/java/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java
+++ b/spring-jms/src/test/java/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-public class MapMessageConvertAndSendTest {
+public class DefaultTextMessageSenderTest {
 
     private static SampleJmsMessageSender messageProducer;
 
@@ -17,8 +17,8 @@ public class MapMessageConvertAndSendTest {
     }
 
     @Test
-    public void testSendMessage() {
-        messageProducer.sendMessage(new Employee("JavaDeveloper2", 22));
+    public void testSimpleSend() {
+        messageProducer.simpleSend();
     }
 
 }