diff --git a/cdi/README.md b/cdi/README.md
index 24f431b75..b80caf6c2 100644
--- a/cdi/README.md
+++ b/cdi/README.md
@@ -24,6 +24,9 @@ The [JSR 346](https://jcp.org/en/jsr/detail?id=346) updates and clarifications t
  - nobeans-el-injection
  - nobeans-el-injection-flowscoped
  - events
+ - events-conditional-reception
+ - instance
+ - instance-qualifiers
 
 ## How to run
 
diff --git a/cdi/beanmanager/pom.xml b/cdi/beanmanager/pom.xml
index 227646024..3bc43f077 100644
--- a/cdi/beanmanager/pom.xml
+++ b/cdi/beanmanager/pom.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
+<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>
 
-    <parent>
-        <groupId>org.javaee7</groupId>
-        <artifactId>cdi</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <groupId>org.javaee7</groupId>
-    <artifactId>cdi-beanmanager</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>war</packaging>
-    <name>Java EE 7 Sample: cdi - beanmanager</name>
+	<parent>
+		<groupId>org.javaee7</groupId>
+		<artifactId>cdi</artifactId>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>cdi-beanmanager</artifactId>
+	<name>Java EE 7 Sample: cdi - beanmanager</name>
 
-    <properties>
-        <netbeans.hint.deploy.server>gfv3ee6</netbeans.hint.deploy.server>
-    </properties>
 </project>
diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/Greeting.java b/cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/Greeting.java
similarity index 69%
rename from cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/Greeting.java
rename to cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/Greeting.java
index 6c4aa4cc9..5e4ab2641 100644
--- a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/Greeting.java
+++ b/cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/Greeting.java
@@ -1,4 +1,4 @@
-package org.javaee7.cdisamples.beanmanager;
+package org.javaee7.cdi.beanmanager;
 
 /**
  * @author Arun Gupta
diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SimpleGreeting.java b/cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/SimpleGreeting.java
similarity index 80%
rename from cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SimpleGreeting.java
rename to cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/SimpleGreeting.java
index 1eea9fba6..8e34ccf7d 100644
--- a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SimpleGreeting.java
+++ b/cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/SimpleGreeting.java
@@ -1,4 +1,4 @@
-package org.javaee7.cdisamples.beanmanager;
+package org.javaee7.cdi.beanmanager;
 
 /**
  * @author Arun Gupta
diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SmileyGreeting.java b/cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/SmileyGreeting.java
similarity index 81%
rename from cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SmileyGreeting.java
rename to cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/SmileyGreeting.java
index d0de2d9c1..f06f3c754 100644
--- a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SmileyGreeting.java
+++ b/cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/SmileyGreeting.java
@@ -1,4 +1,4 @@
-package org.javaee7.cdisamples.beanmanager;
+package org.javaee7.cdi.beanmanager;
 
 /**
  * @author Arun Gupta
diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletCurrent.java b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletCurrent.java
deleted file mode 100644
index ca7343964..000000000
--- a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletCurrent.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.javaee7.cdisamples.beanmanager;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Set;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author Arun Gupta
- */
-@WebServlet(urlPatterns = { "/TestServletCurrent" })
-public class TestServletCurrent extends HttpServlet {
-
-    /**
-     * Processes requests for both HTTP
-     * <code>GET</code> and
-     * <code>POST</code> methods.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
-        try (PrintWriter out = response.getWriter()) {
-            out.println("<!DOCTYPE html>");
-            out.println("<html>");
-            out.println("<head>");
-            out.println("<title>BeanManager using CDI.current</title>");
-            out.println("</head>");
-            out.println("<body>");
-            out.println("<h1>BeanManager using CDI.current</h1>");
-            // Second way to get BeanManager
-            BeanManager bm = CDI.current().getBeanManager();
-
-            Set<Bean<?>> beans = bm.getBeans(Greeting.class);
-            for (Bean<?> b : beans) {
-                out.println(b.getBeanClass().getName() + "<br>");
-            }
-            out.println("</body>");
-            out.println("</html>");
-        }
-    }
-
-    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
-    /**
-     * Handles the HTTP
-     * <code>GET</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
-    /**
-     * Handles the HTTP
-     * <code>POST</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
-    /**
-     * Returns a short description of the servlet.
-     *
-     * @return a String containing servlet description
-     */
-    @Override
-    public String getServletInfo() {
-        return "Short description";
-    }// </editor-fold>
-
-}
diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletInject.java b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletInject.java
deleted file mode 100644
index 6c11b4c1d..000000000
--- a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletInject.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.javaee7.cdisamples.beanmanager;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Set;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author Arun Gupta
- */
-@WebServlet(urlPatterns = { "/TestServletInject" })
-public class TestServletInject extends HttpServlet {
-
-    // First way to get BeanManager
-    @Inject
-    BeanManager bm;
-
-    /**
-     * Processes requests for both HTTP
-     * <code>GET</code> and
-     * <code>POST</code> methods.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
-        try (PrintWriter out = response.getWriter()) {
-            out.println("<!DOCTYPE html>");
-            out.println("<html>");
-            out.println("<head>");
-            out.println("<title>BeanManager using Injection</title>");
-            out.println("</head>");
-            out.println("<body>");
-            out.println("<h1>BeanManager using Injection</h1>");
-            Set<Bean<?>> beans = bm.getBeans(Greeting.class);
-            for (Bean<?> b : beans) {
-                out.println(b.getBeanClass().getName() + "<br>");
-            }
-            out.println("</body>");
-            out.println("</html>");
-        }
-    }
-
-    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
-    /**
-     * Handles the HTTP
-     * <code>GET</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
-    /**
-     * Handles the HTTP
-     * <code>POST</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
-    /**
-     * Returns a short description of the servlet.
-     *
-     * @return a String containing servlet description
-     */
-    @Override
-    public String getServletInfo() {
-        return "Short description";
-    }// </editor-fold>
-
-}
diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletJNDI.java b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletJNDI.java
deleted file mode 100644
index 99d5bedc8..000000000
--- a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletJNDI.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.javaee7.cdisamples.beanmanager;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author Arun Gupta
- */
-@WebServlet(urlPatterns = { "/TestServletJNDI" })
-public class TestServletJNDI extends HttpServlet {
-
-    /**
-     * Processes requests for both HTTP
-     * <code>GET</code> and
-     * <code>POST</code> methods.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
-        try (PrintWriter out = response.getWriter()) {
-            out.println("<!DOCTYPE html>");
-            out.println("<html>");
-            out.println("<head>");
-            out.println("<title>BeanManager using JNDI</title>");
-            out.println("</head>");
-            out.println("<body>");
-            out.println("<h1>BeanManager using JNDI</h1>");
-            // Third way to get BeanManager
-            BeanManager bm = null;
-            try {
-                InitialContext context = new InitialContext();
-                bm = (BeanManager) context.lookup("java:comp/BeanManager");
-            } catch (NamingException | NullPointerException ex) {
-                ex.printStackTrace(out);
-            }
-            Set<Bean<?>> beans = bm.getBeans(Greeting.class);
-            for (Bean<?> b : beans) {
-                out.println(b.getBeanClass().getName() + "<br>");
-            }
-            out.println("</body>");
-            out.println("</html>");
-        }
-    }
-
-    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
-    /**
-     * Handles the HTTP
-     * <code>GET</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
-    /**
-     * Handles the HTTP
-     * <code>POST</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
-    /**
-     * Returns a short description of the servlet.
-     *
-     * @return a String containing servlet description
-     */
-    @Override
-    public String getServletInfo() {
-        return "Short description";
-    }// </editor-fold>
-
-}
diff --git a/cdi/beanmanager/src/main/webapp/WEB-INF/beans.xml b/cdi/beanmanager/src/main/webapp/WEB-INF/beans.xml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/cdi/beanmanager/src/main/webapp/index.jsp b/cdi/beanmanager/src/main/webapp/index.jsp
deleted file mode 100644
index f72da678c..000000000
--- a/cdi/beanmanager/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
--->
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>CDI : BeanManager</title>
-    </head>
-    <body>
-        <h1>CDI : BeanManager</h1>
-
-        Show the list of beans using BeanManager by:
-        <ol>
-            <li><a href="${pageContext.request.contextPath}/TestServletInject"/>injection</a>
-            <li><a href="${pageContext.request.contextPath}/TestServletCurrent"/>CDI.current</a>
-            <li><a href="${pageContext.request.contextPath}/TestServletJNDI"/>JNDI</a>
-        </ol>
-
-</body>
-</html>
diff --git a/cdi/beanmanager/src/test/java/org/javaee7/cdi/beanmanager/GreetingTest.java b/cdi/beanmanager/src/test/java/org/javaee7/cdi/beanmanager/GreetingTest.java
new file mode 100644
index 000000000..222c596fd
--- /dev/null
+++ b/cdi/beanmanager/src/test/java/org/javaee7/cdi/beanmanager/GreetingTest.java
@@ -0,0 +1,71 @@
+package org.javaee7.cdi.beanmanager;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.CDI;
+import javax.inject.Inject;
+import javax.naming.InitialContext;
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Radim Hanus
+ */
+@RunWith(Arquillian.class)
+public class GreetingTest {
+	@Deployment
+	public static Archive<?> deploy() {
+		return ShrinkWrap.create(JavaArchive.class)
+				.addClasses(Greeting.class, SimpleGreeting.class, SmileyGreeting.class)
+				.addAsManifestResource("beans.xml");
+	}
+
+    // First way to get BeanManager
+	@Inject
+	private BeanManager bm;
+
+	@Test
+	public void testInject() throws Exception {
+		test(this.bm);
+	}
+
+	@Test
+	public void testCurrent() throws Exception {
+		// Second way to get BeanManager: current CDI container
+		BeanManager bm = CDI.current().getBeanManager();
+
+		test(bm);
+	}
+
+	@Test
+	public void testJNDI() throws Exception {
+		// Third way to get BeanManager: name service
+		BeanManager bm = InitialContext.doLookup("java:comp/BeanManager");
+
+		test(bm);
+	}
+
+	private void test(BeanManager bm) throws Exception {
+		Set<Bean<?>> beans = bm.getBeans(Greeting.class);
+		assertTrue(beans.size() == 2);
+
+		Set<String> beanClassNames = new HashSet<>();
+		for (Bean bean : beans) {
+			beanClassNames.add(bean.getBeanClass().getName());
+		}
+
+		assertThat(beanClassNames, containsInAnyOrder(SimpleGreeting.class.getName(), SmileyGreeting.class.getName()));
+	}
+}
diff --git a/cdi/beanmanager/src/test/resources/beans.xml b/cdi/beanmanager/src/test/resources/beans.xml
new file mode 100644
index 000000000..be95b1d6e
--- /dev/null
+++ b/cdi/beanmanager/src/test/resources/beans.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       bean-discovery-mode="all">
+
+</beans>
diff --git a/cdi/events-conditional-reception/pom.xml b/cdi/events-conditional-reception/pom.xml
index b5e94b7cd..7205781b3 100644
--- a/cdi/events-conditional-reception/pom.xml
+++ b/cdi/events-conditional-reception/pom.xml
@@ -9,5 +9,5 @@
         <relativePath>../pom.xml</relativePath>        
     </parent>
     <artifactId>cdi-events-conditional-reception</artifactId>
-    <name>Java EE 7 Sample: conditional reception of cdi events</name>
+    <name>Java EE 7 Sample: cdi - events-conditional-reception</name>
 </project>
diff --git a/cdi/instance-qualifiers/pom.xml b/cdi/instance-qualifiers/pom.xml
index 46d71cf4b..d47968f8b 100644
--- a/cdi/instance-qualifiers/pom.xml
+++ b/cdi/instance-qualifiers/pom.xml
@@ -12,6 +12,6 @@
 	</parent>
 
 	<artifactId>cdi-instance-qualifiers</artifactId>
-	<name>Java EE 7 Sample: cdi/instance-qualifiers</name>
+	<name>Java EE 7 Sample: cdi - instance-qualifiers</name>
 
 </project>
\ No newline at end of file
diff --git a/cdi/instance/pom.xml b/cdi/instance/pom.xml
index 309e9ff8b..d745d9961 100644
--- a/cdi/instance/pom.xml
+++ b/cdi/instance/pom.xml
@@ -11,6 +11,6 @@
 	</parent>
 
 	<artifactId>cdi-instance</artifactId>
-	<name>Java EE 7 Sample: cdi/instance</name>
+	<name>Java EE 7 Sample: cdi - instance</name>
 
 </project>
\ No newline at end of file