diff --git a/struts2/pom.xml b/struts2/pom.xml
index 9b9adeaf46..0ae054ef38 100644
--- a/struts2/pom.xml
+++ b/struts2/pom.xml
@@ -1,48 +1,59 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>struts2</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>war</packaging>
-    <name>struts2</name>
-
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>src</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.0.0</version>
-                <configuration>
-                    <warSourceDirectory>WebContent</warSourceDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.apache.struts/struts2-core -->
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-            <version>2.5.5</version>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.baeldung</groupId>
+	<artifactId>MyStrutsApp</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<name>MyStrutsApp</name>
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<resources>
+			<resource>
+				<directory>src</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>3.0.0</version>
+				<configuration>
+					<warSourceDirectory>WebContent</warSourceDirectory>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22struts2-core%22 -->
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts2-core</artifactId>
+			<version>2.5.5</version>
+		</dependency>
+		<!-- http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22struts2-core%22 -->
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts2-junit-plugin</artifactId>
+			<version>2.5.5</version>
+		</dependency>
+		<!-- http://search.maven.org/#search%7Cga%7C1%7Cstruts2-convention-plugin -->
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts2-convention-plugin</artifactId>
+			<version>2.5.8</version>
+		</dependency>
+		<dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+             <version>3.0.1</version>
         </dependency>
-    </dependencies>
-
+	</dependencies>
 </project>
\ No newline at end of file
diff --git a/struts2/src/com/baeldung/struts/CarAction.java b/struts2/src/com/baeldung/struts/CarAction.java
index a96aa440b6..0b9266339c 100644
--- a/struts2/src/com/baeldung/struts/CarAction.java
+++ b/struts2/src/com/baeldung/struts/CarAction.java
@@ -1,7 +1,14 @@
 package com.baeldung.struts;
 
-public class CarAction {
+import org.apache.struts2.convention.annotation.Action;
+import org.apache.struts2.convention.annotation.Namespace;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.ResultPath;
 
+@Namespace("/tutorial")
+@Action("/car")
+@Result(name = "success", location = "/result.jsp")
+public class CarAction { 
     private String carName;
     private String carMessage;
     private CarMessageService carMessageService = new CarMessageService();
diff --git a/struts2/src/com/baeldung/struts/CarMessageService.java b/struts2/src/com/baeldung/struts/CarMessageService.java
index fef9c1719d..34d3ca3d76 100644
--- a/struts2/src/com/baeldung/struts/CarMessageService.java
+++ b/struts2/src/com/baeldung/struts/CarMessageService.java
@@ -4,12 +4,15 @@ public class CarMessageService {
 
     public String getMessage(String carName) {
         System.out.println("inside getMessage()" + carName);
-        if (carName.equalsIgnoreCase("ferrari"))
+        if (carName.equalsIgnoreCase("ferrari")){
             return "Ferrari Fan!";
-        else if (carName.equalsIgnoreCase("bmw"))
+        }
+        else if (carName.equalsIgnoreCase("bmw")){
             return "BMW Fan!";
-        else
+        }
+        else{
             return "please choose ferrari Or bmw";
+        }
     }
 
 }
diff --git a/struts2/src/com/baeldung/struts/test/TestCarAction.java b/struts2/src/com/baeldung/struts/test/TestCarAction.java
new file mode 100644
index 0000000000..ec21bd689a
--- /dev/null
+++ b/struts2/src/com/baeldung/struts/test/TestCarAction.java
@@ -0,0 +1,32 @@
+package com.baeldung.struts.test;
+import org.apache.struts2.StrutsTestCase;
+import org.junit.Test;
+
+
+import com.baeldung.struts.CarAction;
+import com.opensymphony.xwork2.ActionProxy;
+
+public class TestCarAction extends StrutsTestCase {
+   
+    @Test
+    public void test_givenCarOptions_WhenferrariSelected_ThenShowMessage() throws Exception {
+        request.setParameter("carName", "ferrari");
+        ActionProxy proxy = getActionProxy("/tutorial/car.action");
+        CarAction carAction = (CarAction) proxy.getAction();
+        String result = proxy.execute();
+        assertEquals(result,"success");
+        assertEquals(carAction.getCarMessage(), "Ferrari Fan!");
+    }
+  
+    
+    public void test_givenCarOptions_WhenbmwSelected_ThenShowMessage() throws Exception {
+        request.setParameter("carName", "bmw");
+        ActionProxy proxy = getActionProxy("/tutorial/car.action");
+        CarAction carAction = (CarAction) proxy.getAction();
+        String result = proxy.execute();
+        assertEquals(result,"success");
+        assertEquals(carAction.getCarMessage(), "BMW Fan!");
+    }
+    
+    
+}
diff --git a/struts2/src/struts.xml b/struts2/src/struts.xml
deleted file mode 100644
index 1c117ac900..0000000000
--- a/struts2/src/struts.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts PUBLIC
-   "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-   "http://struts.apache.org/dtds/struts-2.0.dtd">
-<struts>
-	<package name="tutorial" extends="struts-default" namespace="/tutorial">
-		<action name="car" class="com.baeldung.struts.CarAction"
-			method="execute">
-			<result name="success">/result.jsp</result>
-		</action>
-	</package>
-</struts>
\ No newline at end of file