diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java
similarity index 89%
rename from core/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatTest.java
rename to components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java
index 8cae4a96704e2..f06dbdb47c988 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java
@@ -14,21 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.impl;
+package org.apache.camel.dataformat.deflater;
 
 import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.zip.GZIPInputStream;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.converter.IOConverter;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
 /**
  * Unit test of the gzip data format.
  */
-public class GzipDataFormatTest extends ContextTestSupport {
+public class GzipDataFormatTest extends CamelTestSupport {
     private static final String TEXT = "Hamlet by William Shakespeare\n"
             + "To be, or not to be: that is the question:\n"
             + "Whether 'tis nobler in the mind to suffer\n"
@@ -42,7 +43,7 @@ public boolean isUseRouteBuilder() {
     }
 
     private byte[] sendText() throws Exception {
-        return (byte[]) template.requestBody("direct:start", TEXT.getBytes("UTF-8"));
+        return (byte[]) template.requestBody("direct:start", TEXT.getBytes(StandardCharsets.UTF_8));
     }
 
     @Test
@@ -71,8 +72,10 @@ public void configure() {
         context.start();
 
         MockEndpoint result = context.getEndpoint("mock:result", MockEndpoint.class);
-        result.expectedBodiesReceived(TEXT.getBytes("UTF-8"));
+        result.expectedBodiesReceived(TEXT.getBytes(StandardCharsets.UTF_8));
+
         sendText();
+
         result.assertIsSatisfied();
     }
 }
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/TokenPairExpressionIterator.java b/core/camel-core/src/main/java/org/apache/camel/builder/TokenPairExpressionIterator.java
index 2f2461bd205db..421c910b68df9 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/TokenPairExpressionIterator.java
+++ b/core/camel-core/src/main/java/org/apache/camel/builder/TokenPairExpressionIterator.java
@@ -23,9 +23,9 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
-import org.apache.camel.language.simple.SimpleLanguage;
 import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.support.ExpressionAdapter;
+import org.apache.camel.support.LanguageSupport;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.Scanner;
@@ -104,12 +104,12 @@ protected Object doEvaluate(Exchange exchange, boolean closeStream) {
      */
     protected Iterator<?> createIterator(Exchange exchange, InputStream in, String charset) {
         String start = startToken;
-        if (start != null && SimpleLanguage.hasSimpleFunction(start)) {
-            start = SimpleLanguage.expression(start).evaluate(exchange, String.class);
+        if (LanguageSupport.hasSimpleFunction(start)) {
+            start = exchange.getContext().resolveLanguage("simple").createExpression(start).evaluate(exchange, String.class);
         }
         String end = endToken;
-        if (end != null && SimpleLanguage.hasSimpleFunction(end)) {
-            end = SimpleLanguage.expression(end).evaluate(exchange, String.class);
+        if (LanguageSupport.hasSimpleFunction(end)) {
+            end = exchange.getContext().resolveLanguage("simple").createExpression(end).evaluate(exchange, String.class);
         }
         TokenPairIterator iterator = new TokenPairIterator(start, end, includeTokens, in, charset);
         iterator.init();
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/TokenXMLExpressionIterator.java b/core/camel-core/src/main/java/org/apache/camel/builder/TokenXMLExpressionIterator.java
index 60471c77013ae..daff58170a2d1 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/TokenXMLExpressionIterator.java
+++ b/core/camel-core/src/main/java/org/apache/camel/builder/TokenXMLExpressionIterator.java
@@ -74,7 +74,7 @@ protected Iterator<?> createIterator(Exchange exchange, InputStream in, String c
             tag = exchange.getContext().resolveLanguage("simple").createExpression(tag).evaluate(exchange, String.class);
         }
         String inherit = inheritNamespaceToken;
-        if (inherit != null && LanguageSupport.hasSimpleFunction(tag)) {
+        if (LanguageSupport.hasSimpleFunction(inherit)) {
             inherit = exchange.getContext().resolveLanguage("simple").createExpression(inherit).evaluate(exchange, String.class);
         }