fix small test failurs and Diamond
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
index 8b36898..4d41d97 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
@@ -41,7 +41,7 @@
 public class DefaultMessage implements Message
 {
     private String messageTemplate;
-    private List<Serializable> arguments = new ArrayList<Serializable>();
+    private List<Serializable> arguments = new ArrayList<>();
 
     private MessageContext messageContext;
 
@@ -55,7 +55,7 @@
     protected void reset()
     {
         messageTemplate = null;
-        arguments = new ArrayList<Serializable>();
+        arguments = new ArrayList<>();
     }
 
     @Override
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java
index f554c41..3999e7b 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java
@@ -83,7 +83,7 @@
         driver.get(new URL(contextPath, "testValidatorConverter.xhtml").toString());
         WebElement convertedValue = driver.findElement(By.id("converter:convertedValue"));
         convertedValue.sendKeys("String Value");
-        WebElement testConveterButton = driver.findElement(By.id("converter:testConveterButton"));
+        WebElement testConveterButton = driver.findElement(By.id("converter:testConverterButton"));
         testConveterButton.click();
         Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("converter:errorMessage"), "Value is not an Integer").apply(driver));
     }
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/injection/testValidatorConverter.xhtml b/deltaspike/modules/jsf/impl/src/test/resources/injection/testValidatorConverter.xhtml
index 5b124b9..1bb2fc6 100644
--- a/deltaspike/modules/jsf/impl/src/test/resources/injection/testValidatorConverter.xhtml
+++ b/deltaspike/modules/jsf/impl/src/test/resources/injection/testValidatorConverter.xhtml
@@ -34,7 +34,7 @@
 		</h:inputText>
 		<h:message id="errorMessage" for="convertedValue" />
 		<br />
-		<h:commandButton id="testConveterButton"
+		<h:commandButton id="testConverterButton"
 			action="#{myBean.testAction()}" value="Test Conveter" />
 	</h:form>
 	<h:form id="validator">