diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests-context.xml
index 746bc915e7..dd8cc6c74c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests-context.xml
@@ -12,6 +12,6 @@
 	</selector-chain>
 
 	<beans:bean id="someBean"
-		class="org.springframework.integration.config.xml.MethodInvokingSelectorParserTests$SomeClass" />
+		class="org.springframework.integration.config.xml.MethodInvokingSelectorParserTests$TestFilter" />
 
 </beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java
index 9815888095..56b37adc22 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java
@@ -1,27 +1,48 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.integration.config.xml;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
 
 import java.util.List;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.core.Message;
 import org.springframework.integration.filter.MethodInvokingSelector;
 import org.springframework.integration.selector.MessageSelector;
 import org.springframework.integration.selector.MessageSelectorChain;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
-
+/**
+ * @author Iwein Fuld
+ */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
 public class MethodInvokingSelectorParserTests {
+
 	@Autowired
-	MessageSelectorChain chain;
+	private MessageSelectorChain chain;
+
 
 	@SuppressWarnings("unchecked")
 	@Test
@@ -31,9 +52,11 @@ public class MethodInvokingSelectorParserTests {
 		assertThat(selectors.get(0), is(MethodInvokingSelector.class));
 	}
 
-	public static class SomeClass {
-		public boolean accept(Message m) {
+
+	public static class TestFilter {
+		public boolean accept(Message<?> m) {
 			return true;
 		}
 	}
+
 }