diff --git a/src/Commons/Pipeline.php b/src/Commons/Pipeline.php
index e3a7010..8f275d5 100644
--- a/src/Commons/Pipeline.php
+++ b/src/Commons/Pipeline.php
@@ -142,6 +142,7 @@ public function remove( AbstractHandler $handlerToDelete ) {
         foreach ( $this->handlers as $pos => $handler ) {
             if ( $handler->getName() == $handlerToDelete->getName() ) {
                 unset( $this->handlers[ $pos ] );
+                $this->handlers = array_values( $this->handlers );
                 break;
             }
         }
diff --git a/src/Filters/DataRefRestore.php b/src/Filters/DataRefRestore.php
index a7e1a5e..fcd9196 100644
--- a/src/Filters/DataRefRestore.php
+++ b/src/Filters/DataRefRestore.php
@@ -59,7 +59,7 @@ public function transform( $segment ) {
      * @return string
      */
     private function restoreXliffPhTagsFromMatecatPhTags( $segment ) {
-        preg_match_all( '|<ph id="mtc_[0-9]+" ctype="' . CTypeEnum::ORIGINAL_PH_OR_NOT_DATA_REF . '" equiv-text="base64:(.*?)"/>|iu', $segment, $matches );
+        preg_match_all( '|<ph[^>]+? ctype="' . CTypeEnum::ORIGINAL_PH_OR_NOT_DATA_REF . '" equiv-text="base64:(.*?)"/>|iu', $segment, $matches );
 
         if ( empty( $matches[ 0 ] ) ) {
             return $segment;
@@ -89,8 +89,13 @@ private function restoreXliffPhTagsFromMatecatPhTags( $segment ) {
      * @return string
      */
     private function restoreXliffPcTagsFromMatecatPhTags( $segment ) {
-        preg_match_all( '|<ph.+? ctype="' . CTypeEnum::ORIGINAL_PC_OPEN_NO_DATA_REF . '" equiv-text="base64:(.*?)"/>|iu', $segment, $matches );
-        preg_match_all( '|<ph.+? ctype="' . CTypeEnum::ORIGINAL_PC_CLOSE_NO_DATA_REF . '" equiv-text="base64:(.*?)"/>|iu', $segment, $matches );
+
+        $matches = [];
+        preg_match_all( '|<ph[^>]+? ctype="' . CTypeEnum::ORIGINAL_PC_OPEN_NO_DATA_REF . '" equiv-text="base64:(.*?)"/>|iu', $segment, $open_matches );
+        preg_match_all( '|<ph[^>]+? ctype="' . CTypeEnum::ORIGINAL_PC_CLOSE_NO_DATA_REF . '" equiv-text="base64:(.*?)"/>|iu', $segment, $close_matches );
+
+        $matches[ 0 ] = array_merge( $open_matches[ 0 ], $close_matches[ 0 ] );
+        $matches[ 1 ] = array_merge( $open_matches[ 1 ], $close_matches[ 1 ] );
 
         if ( empty( $matches[ 0 ] ) ) {
             return $segment;
diff --git a/src/Filters/Html/HtmlParser.php b/src/Filters/Html/HtmlParser.php
index 1dc7084..253cd31 100644
--- a/src/Filters/Html/HtmlParser.php
+++ b/src/Filters/Html/HtmlParser.php
@@ -82,6 +82,9 @@ public function __call( $name, $arguments ) {
 
             return $reflector->invoke( $this->callbacksHandler, $arguments[ 0 ] );
         }
+
+        return null;
+
     }
 
     public function transform( $segment ) {
@@ -127,9 +130,6 @@ public function transform( $segment ) {
                         // is not possible to have angle brackets inside a tag, this case can not happen
                         // this code would ignore '>' if inside a quote, useless
                         // for more info see https://www.w3.org/TR/xml/#charsets
-//                        if ( $in_quote_char ) {
-//                            break;
-//                        }
 
                         // if we found a second less than symbol the first one IS NOT a tag,
                         // treat the html_buffer as plain text and attach to the output
@@ -141,9 +141,6 @@ public function transform( $segment ) {
                         // is not possible to have angle brackets inside a tag, this case can not happen
                         // this code would ignore '>' if inside a quote, useless
                         // for more info see https://www.w3.org/TR/xml/#charsets
-//                        if ( $in_quote_char ) {
-//                            break;
-//                        }
 
                         if ( in_array( substr( $html_buffer, 0, 8 ), [ '<script ', '<style', '<script', '<style ' ] ) ) {
                             $html_buffer .= $char;
@@ -247,49 +244,39 @@ public function transform( $segment ) {
                         break;
                 }
             } elseif ( $state == static::STATE_COMMENT ) {
-                switch ( $char ) {
-                    case '>':
-                        $html_buffer .= $char;
 
-                        if ( substr( $html_buffer, -3 ) == '-->' ) {
-                            // close the comment
-                            $state       = static::STATE_PLAINTEXT;
-                            $output      .= $this->_finalizeScriptTag( $html_buffer );
-                            $html_buffer = '';
+                $html_buffer .= $char;
 
-                            if ( $this->_isTagValid( $html_buffer ) and null !== $this->pipeline ) {
-                                $this->_setSegmentContainsHtml();
-                            }
-                        }
-
-                        break;
+                if ( $char == '>' ) {
+                    if ( substr( $html_buffer, -3 ) == '-->' ) {
+                        // close the comment
+                        $state       = static::STATE_PLAINTEXT;
+                        $output      .= $this->_finalizeScriptTag( $html_buffer );
+                        $html_buffer = '';
 
-                    default:
-                        $html_buffer .= $char;
-                        break;
+                        if ( $this->_isTagValid( $html_buffer ) and null !== $this->pipeline ) {
+                            $this->_setSegmentContainsHtml();
+                        }
+                    }
                 }
-            } elseif ( $state == static::STATE_JS_CSS ) {
-                switch ( $char ) {
-                    case '>':
-                        $html_buffer .= $char;
 
-                        if ( in_array( substr( $html_buffer, -6 ), [ 'cript>', 'style>' ] ) ) {
-                            // close the comment
-                            $state       = static::STATE_PLAINTEXT;
-                            $output      .= $this->_finalizeScriptTag( $html_buffer );
-                            $html_buffer = '';
+            } elseif ( $state == static::STATE_JS_CSS ) {
 
-                            if ( $this->_isTagValid( $html_buffer ) and null !== $this->pipeline ) {
-                                $this->_setSegmentContainsHtml();
-                            }
-                        }
+                $html_buffer .= $char;
 
-                        break;
+                if ( $char == '>' ) {
+                    if ( in_array( substr( $html_buffer, -6 ), [ 'cript>', 'style>' ] ) ) {
+                        // close the comment
+                        $state       = static::STATE_PLAINTEXT;
+                        $output      .= $this->_finalizeScriptTag( $html_buffer );
+                        $html_buffer = '';
 
-                    default:
-                        $html_buffer .= $char;
-                        break;
+                        if ( $this->_isTagValid( $html_buffer ) and null !== $this->pipeline ) {
+                            $this->_setSegmentContainsHtml();
+                        }
+                    }
                 }
+
             }
         }
 
diff --git a/src/Filters/Percentages.php b/src/Filters/Percentages.php
index e73ed5d..406144a 100644
--- a/src/Filters/Percentages.php
+++ b/src/Filters/Percentages.php
@@ -28,7 +28,7 @@ class Percentages extends AbstractHandler {
      * @return string
      */
     public function transform( $segment ) {
-        preg_match_all( '/%%[^<>\s%]+?%%/', $segment, $html, PREG_SET_ORDER ); // removed single percentage support '/(?<!{)%[^<>\s%]+?%/'
+        preg_match_all( '/%%[^<>\s%{}]+?%%/', $segment, $html, PREG_SET_ORDER ); // removed single percentage support '/(?<!{)%[^<>\s%]+?%/'
         foreach ( $html as $pos => $percentage_variable ) {
             //check if inside twig variable there is a tag because in this case shouldn't replace the content with PH tag
             if ( !strstr( $percentage_variable[ 0 ], ConstantEnum::GTPLACEHOLDER ) ) {
diff --git a/src/Filters/RubyOnRailsI18n.php b/src/Filters/RubyOnRailsI18n.php
index 63e36cb..ccb2037 100644
--- a/src/Filters/RubyOnRailsI18n.php
+++ b/src/Filters/RubyOnRailsI18n.php
@@ -28,14 +28,22 @@ class RubyOnRailsI18n extends AbstractHandler {
      * @return string
      */
     public function transform( $segment ) {
-        preg_match_all( '/%{[^<>\s%]+?}/', $segment, $html, PREG_SET_ORDER );
-        foreach ( $html as $pos => $percentage_variable ) {
+
+        /*
+         * Examples:
+         * - %{# }
+         * - %{\n}$spaces=2%{\n}
+         * - %{vars}
+         *
+         */
+        preg_match_all( '/%{(?!<ph )[^{}]*?}/', $segment, $html, PREG_SET_ORDER );
+        foreach ( $html as $pos => $ruby_variable ) {
             //check if inside twig variable there is a tag because in this case shouldn't replace the content with PH tag
-            if ( !strstr( $percentage_variable[ 0 ], ConstantEnum::GTPLACEHOLDER ) ) {
+            if ( !strstr( $ruby_variable[ 0 ], ConstantEnum::GTPLACEHOLDER ) ) {
                 //replace subsequent elements excluding already encoded
                 $segment = preg_replace(
-                        '/' . preg_quote( $percentage_variable[ 0 ], '/' ) . '/',
-                        '<ph id="' . $this->getPipeline()->getNextId() . '" ctype="' . CTypeEnum::RUBY_ON_RAILS . '" equiv-text="base64:' . base64_encode( $percentage_variable[ 0 ] ) . '"/>',
+                        '/' . preg_quote( $ruby_variable[ 0 ], '/' ) . '/',
+                        '<ph id="' . $this->getPipeline()->getNextId() . '" ctype="' . CTypeEnum::RUBY_ON_RAILS . '" equiv-text="base64:' . base64_encode( $ruby_variable[ 0 ] ) . '"/>',
                         $segment,
                         1
                 );
diff --git a/src/Filters/Variables.php b/src/Filters/Variables.php
index 7d90025..e20e433 100644
--- a/src/Filters/Variables.php
+++ b/src/Filters/Variables.php
@@ -15,14 +15,9 @@ class Variables extends AbstractHandler {
     public function transform( $segment ) {
         /*
          * Examples:
-         * - %{# }
-         * - %{\n}$spaces=2%{\n}
          * - %{{(text-align=center)}}
-         * - %{vars}
-         * - [AIRBNB] Reminder: Reply to %{guest}’s inquiry. |||| [AIRBNB] Reminder: Reply to %{guest}’s inquiry.
          */
-//        preg_match_all( '/%{{[^}]*?}}|(%{[^}]*?})[^\|]+?\1|(%{[^}]*?})/', $segment, $html, PREG_SET_ORDER );
-        preg_match_all( '/%{{(?!<ph )[^}]*?}}|(%{(?!<ph )[^}]*?})/', $segment, $html, PREG_SET_ORDER );
+        preg_match_all( '/%{{(?!<ph )[^{}]*?}}/', $segment, $html, PREG_SET_ORDER );
         foreach ( $html as $pos => $variable ) {
             //replace subsequent elements excluding already encoded
             $segment = preg_replace(
diff --git a/src/Utils/ArrayList.php b/src/Utils/ArrayList.php
index 8dcc796..2bd9b93 100644
--- a/src/Utils/ArrayList.php
+++ b/src/Utils/ArrayList.php
@@ -10,13 +10,21 @@
 namespace Matecat\SubFiltering\Utils;
 
 use ArrayObject;
+use DomainException;
 
+/**
+ * A Java like Interface helper for key/value php arrays, with safe access to the elements (no warning for undefined index)
+ *
+ */
 class ArrayList extends ArrayObject {
 
     /**
      * @param array $list
      */
     public function __construct( array $list = [] ) {
+        if ( !empty( $list ) && !Utils::array_is_list( $list ) ) {
+            throw new DomainException( "Invalid list provided" );
+        }
         parent::__construct( $list );
     }
 
@@ -48,5 +56,16 @@ public function get( $key ) {
         return $this->offsetGet( $key );
     }
 
+    /**
+     * Appends the specified element to the end of this list.
+     *
+     * @param $value
+     *
+     * @return true
+     */
+    public function add( $value ) {
+        parent::append( $value );
+        return true;
+    }
 
 }
\ No newline at end of file
diff --git a/src/Utils/Map.php b/src/Utils/Map.php
index 0a58400..06af0aa 100644
--- a/src/Utils/Map.php
+++ b/src/Utils/Map.php
@@ -11,14 +11,16 @@
 
 use ArrayAccess;
 use ArrayIterator;
+use Countable;
+use DomainException;
 use Generator;
 use IteratorAggregate;
 
 /**
- * Java like interface helper for key/value php arrays
+ * A Java like Interface helper for key/value php arrays, with safe access to the elements (no warning for undefined index)
  *
  */
-class Map implements IteratorAggregate, ArrayAccess {
+class Map implements ArrayAccess, IteratorAggregate, Countable {
 
     /**
      * @var array
@@ -26,9 +28,20 @@ class Map implements IteratorAggregate, ArrayAccess {
     private $map;
 
     public function __construct( array $map ) {
+        if ( !empty( $map ) && Utils::array_is_list( $map ) ) {
+            throw new DomainException( "Invalid map provided" );
+        }
         $this->map = $map;
     }
 
+    /**
+     * @return int
+     */
+    public function count() {
+        return sizeof( $this->map );
+    }
+
+
     /**
      * @return ArrayIterator
      */
@@ -73,16 +86,13 @@ public function offsetUnset( $offset ) {
         $this->remove( $offset );
     }
 
-
     /**
-     * @return Generator
+     * Static helper for constructor
+     *
+     * @param array $map
+     *
+     * @return static
      */
-    public function entrySet() {
-        foreach ( $this->map as $k => $v ) {
-            yield [ $k, $v ];
-        }
-    }
-
     public static function instance( array $map = [] ) {
         return new static( $map );
     }
@@ -124,8 +134,8 @@ public function __clone() {
         return new static( $this->map );
     }
 
-    public function containsKey( $key ) {
-        return array_key_exists( $key, $this->map );
+    public function containsKey( $offset ) {
+        return array_key_exists( $offset, $this->map );
     }
 
     /**
@@ -134,10 +144,10 @@ public function containsKey( $key ) {
      *
      * @param $value
      *
-     * @return false|string
+     * @return boolean
      */
     public function containsValue( $value ) {
-        return array_search( $value, $this->map, true );
+        return !empty( array_search( $value, $this->map, true ) );
     }
 
     /**
@@ -148,9 +158,9 @@ public function containsValue( $value ) {
      *
      * @return Generator
      */
-    public function foreEach( callable $callable ) {
+    public function for_each( callable $callable ) {
         foreach ( $this->map as $k => $v ) {
-            yield $callable( $k, $v );
+            $callable( $k, $v );
         }
     }
 
@@ -164,23 +174,23 @@ public function isEmpty() {
     }
 
     /**
-     * @return Map
+     * @return string[]
      */
     public function keySet() {
-        return static::instance( array_keys( $this->map ) );
+        return array_keys( $this->map );
     }
 
     /**
      * Associates the specified value with the specified key in this map. If the map previously contained a mapping for the key, the old value is replaced.
      *
-     * @param $key
+     * @param $offset
      * @param $value
      *
      * @return mixed|null the previous value associated with `key`, or null if there was no mapping for `key`.
      */
-    public function put( $key, $value ) {
-        $previousValue     = $this->get( $key );
-        $this->map[ $key ] = $value;
+    public function put( $offset, $value ) {
+        $previousValue        = $this->get( $offset );
+        $this->map[ $offset ] = $value;
 
         return $previousValue;
     }
@@ -199,16 +209,16 @@ public function putAll( $map ) {
     /**
      * If the specified key is not already associated with a value (or is mapped to null) associates it with the given value and returns null, else returns the current value.
      *
-     * @param $key
+     * @param $offset
      * @param $value
      *
      * @return mixed|null the previous value associated with the specified key, or null if there was no mapping for the key.
      *               A null return can also indicate that the map previously associated null with the `key`
      */
-    public function putIfAbsent( $key, $value ) {
-        $previousValue = $this->get( $key );
+    public function putIfAbsent( $offset, $value ) {
+        $previousValue = $this->get( $offset );
         if ( $previousValue === null ) {
-            $this->map[ $key ] = $value;
+            $this->map[ $offset ] = $value;
         }
 
         return $previousValue;
@@ -217,14 +227,14 @@ public function putIfAbsent( $key, $value ) {
     /**
      * Removes the mapping for the specified key from this map if present.
      *
-     * @param $key
+     * @param $offset
      *
      * @return bool true if the value was removed
      */
-    public function remove( $key ) {
-        $exists = array_key_exists( $key, $this->map );
+    public function remove( $offset ) {
+        $exists = array_key_exists( $offset, $this->map );
         if ( $exists ) {
-            unset( $this->map[ $key ] );
+            unset( $this->map[ $offset ] );
         }
 
         return $exists;
@@ -236,11 +246,11 @@ public function remove( $key ) {
      * @return mixed|null the previous value associated with the specified key, or null if there was no mapping for the key.
      *                      A null return can also indicate that the map previously associated null with the key.
      */
-    public function replace( $key, $value ) {
-        $exists        = array_key_exists( $key, $this->map );
-        $previousValue = $this->get( $key );
+    public function replace( $offset, $value ) {
+        $exists        = array_key_exists( $offset, $this->map );
+        $previousValue = $this->get( $offset );
         if ( $exists ) {
-            $this->map[ $key ] = $value;
+            $this->map[ $offset ] = $value;
         }
 
         return $previousValue;
@@ -249,17 +259,17 @@ public function replace( $key, $value ) {
     /**
      * Replaces the entry for the specified key only if currently mapped to the specified value.
      *
-     * @param $key
+     * @param $offset
      * @param $newValue
      * @param $oldValue
      *
      * @return boolean true if the value was replaced
      */
-    public function replaceIfEquals( $key, $newValue, $oldValue ) {
-        $exists        = array_key_exists( $key, $this->map );
-        $previousValue = $this->get( $key );
+    public function replaceIfEquals( $offset, $newValue, $oldValue ) {
+        $exists        = array_key_exists( $offset, $this->map );
+        $previousValue = $this->get( $offset );
         if ( $exists && $previousValue === $oldValue ) {
-            $this->map[ $key ] = $newValue;
+            $this->map[ $offset ] = $newValue;
 
             return true;
         }
@@ -277,8 +287,8 @@ public function replaceIfEquals( $key, $newValue, $oldValue ) {
      * @return void
      */
     public function replaceAll( callable $callable ) {
-        foreach ( $this->map as $key => $value ) {
-            $this->map[ $key ] = $callable( $key, $value );
+        foreach ( $this->map as $offset => $value ) {
+            $this->map[ $offset ] = $callable( $offset, $value );
         }
     }
 
@@ -290,10 +300,10 @@ public function size() {
     }
 
     /**
-     * @return Map
+     * @return array
      */
     public function values() {
-        return new static( array_values( $this->map ) );
+        return array_values( $this->map );
     }
 
     /**
@@ -307,19 +317,21 @@ public function values() {
      * If the function returns null, the mapping is removed (or remains absent if initially absent).
      * If the function itself throws an (unchecked) exception, the exception is rethrown, and the current mapping is left unchanged.
      *
-     * @param          $key
+     * @param          $offset
      * @param callable $callable
      *
      * @return mixed|null the new value associated with the specified key, or null if none
      */
-    public function compute( $key, callable $callable ) {
-        $exists = array_key_exists( $key, $this->map );
+    public function compute( $offset, callable $callable ) {
+        $exists = array_key_exists( $offset, $this->map );
         if ( $exists ) {
-            $res = $callable( $key, $this->get( $key ) );
+            $res = $callable( $offset, $this->get( $offset ) );
             if ( $res == null ) {
-                unset( $this->map[ $key ] );
+                unset( $this->map[ $offset ] );
             } else {
-                $this->map[ $key ] = $callable( $key, $this->get( $key ) );
+                $this->map[ $offset ] = $callable( $offset, $this->get( $offset ) );
+
+                return $this->map[ $offset ];
             }
         }
 
@@ -335,19 +347,19 @@ public function compute( $key, callable $callable ) {
      *
      * The most common usage is to construct a new object serving as an initial mapped value or memoized result, as in:
      *
-     * @param          $key
+     * @param          $offset
      * @param callable $callable
      *
      * @return mixed|null the current (existing or computed) value associated with the specified key, or null if the computed value is null
      */
-    public function computeIfAbsent( $key, callable $callable ) {
-        $exists        = array_key_exists( $key, $this->map );
-        $previousValue = $this->get( $key );
+    public function computeIfAbsent( $offset, callable $callable ) {
+        $exists        = array_key_exists( $offset, $this->map );
+        $previousValue = $this->get( $offset );
         $res           = null;
-        if ( !$exists || $previousValue !== null ) {
-            $res = $callable( $key, $this->get( $key ) );
+        if ( !$exists || $previousValue === null ) {
+            $res = $callable( $offset, $this->get( $offset ) );
             if ( $res != null ) {
-                $this->map[ $key ] = $res;
+                $this->map[ $offset ] = $res;
             }
 
         }
@@ -362,21 +374,21 @@ public function computeIfAbsent( $key, callable $callable ) {
      * If the function returns null, the mapping is removed.
      * If the function itself throws an (unchecked) exception, the exception is rethrown, and the current mapping is left unchanged.
      *
-     * @param          $key
+     * @param          $offset
      * @param callable $callable
      *
      * @return mixed|null the new value associated with the specified key, or null if none
      */
-    public function computeIfPresent( $key, callable $callable ) {
-        $exists        = array_key_exists( $key, $this->map );
-        $previousValue = $this->get( $key );
+    public function computeIfPresent( $offset, callable $callable ) {
+        $exists        = array_key_exists( $offset, $this->map );
+        $previousValue = $this->get( $offset );
         $res           = null;
         if ( $exists && $previousValue !== null ) {
-            $res = $callable( $key, $this->map[ $key ] );
+            $res = $callable( $offset, $this->map[ $offset ] );
             if ( $res == null ) {
-                unset( $this->map[ $key ] );
+                unset( $this->map[ $offset ] );
             } else {
-                $this->map[ $key ] = $res;
+                $this->map[ $offset ] = $res;
             }
         }
 
diff --git a/src/Utils/Utils.php b/src/Utils/Utils.php
index 4ff40d8..5334324 100644
--- a/src/Utils/Utils.php
+++ b/src/Utils/Utils.php
@@ -4,6 +4,25 @@
 
 class Utils {
 
+    /**
+     * @param $array
+     *
+     * @return bool
+     */
+    public static function array_is_list( $array ) {
+
+        if ( !function_exists( 'array_is_list' ) ) { // since php 8.1
+
+            if ( $array === [] ) {
+                return true;
+            }
+
+            return array_keys( $array ) === range( 0, count( $array ) - 1 );
+        }
+
+        return array_is_list( $array );
+    }
+
     /**
      * @param string $needle
      * @param string $haystack
diff --git a/tests/HandlersOrderTest.php b/tests/HandlersOrderTest.php
new file mode 100644
index 0000000..e076661
--- /dev/null
+++ b/tests/HandlersOrderTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * @author ostico domenico@translated.net / ostico@gmail.com
+ * Date: 08/02/22
+ * Time: 18:30
+ *
+ */
+
+namespace Matecat\SubFiltering\Tests;
+
+use Matecat\SubFiltering\Commons\Pipeline;
+use Matecat\SubFiltering\Filters\HtmlToPh;
+use Matecat\SubFiltering\Filters\LtGtDecode;
+use Matecat\SubFiltering\Filters\Percentages;
+use Matecat\SubFiltering\Filters\PlaceHoldXliffTags;
+use Matecat\SubFiltering\Filters\RestorePlaceHoldersToXLIFFLtGt;
+use Matecat\SubFiltering\Filters\RestoreXliffTagsContent;
+use Matecat\SubFiltering\Filters\RubyOnRailsI18n;
+use Matecat\SubFiltering\Filters\SingleCurlyBracketsToPh;
+use Matecat\SubFiltering\Filters\SprintfToPH;
+use Matecat\SubFiltering\Filters\StandardPHToMateCatCustomPH;
+use Matecat\SubFiltering\Filters\TwigToPh;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+
+class HandlersOrderTest extends TestCase {
+
+    /**
+     * @var Pipeline
+     */
+    protected $channel;
+
+    public function setUp() {
+        $this->channel = new Pipeline( 'it-IT', 'en-US', [] );
+        $this->channel->addLast( new StandardPHToMateCatCustomPH() );
+        $this->channel->addLast( new PlaceHoldXliffTags() );
+        $this->channel->addLast( new LtGtDecode() );
+        $this->channel->addLast( new HtmlToPh() );
+        $this->channel->addLast( new TwigToPh() );
+        $this->channel->addLast( new SprintfToPH() );
+        $this->channel->addLast( new RestoreXliffTagsContent() );
+        $this->channel->addLast( new RestorePlaceHoldersToXLIFFLtGt() );
+    }
+
+    /**
+     * @test
+     */
+    public function testReOrder() {
+
+        $this->channel->remove( new TwigToPh() );
+        $this->channel->remove( new SprintfToPH() );
+
+        $this->channel->addAfter( new HtmlToPh(), new RubyOnRailsI18n() );
+        $this->channel->addAfter( new RubyOnRailsI18n(), new Percentages() );
+        $this->channel->addAfter( new Percentages(), new SprintfToPH() );
+        $this->channel->addAfter( new SprintfToPH(), new TwigToPh() );
+        $this->channel->addAfter( new TwigToPh(), new SingleCurlyBracketsToPh() );
+
+        $reflection = new ReflectionClass( $this->channel );
+        $property   = $reflection->getProperty( 'handlers' );
+        $property->setAccessible( true );
+        $handlerList = $property->getValue( $this->channel );
+
+        $this->assertTrue( $handlerList[ 0 ] instanceof StandardPHToMateCatCustomPH );
+        $this->assertTrue( $handlerList[ 1 ] instanceof PlaceHoldXliffTags );
+        $this->assertTrue( $handlerList[ 2 ] instanceof LtGtDecode );
+        $this->assertTrue( $handlerList[ 3 ] instanceof HtmlToPh );
+        $this->assertTrue( $handlerList[ 4 ] instanceof RubyOnRailsI18n );
+        $this->assertTrue( $handlerList[ 5 ] instanceof Percentages );
+        $this->assertTrue( $handlerList[ 6 ] instanceof SprintfToPH );
+        $this->assertTrue( $handlerList[ 7 ] instanceof TwigToPh );
+        $this->assertTrue( $handlerList[ 8 ] instanceof SingleCurlyBracketsToPh );
+        $this->assertTrue( $handlerList[ 9 ] instanceof RestoreXliffTagsContent );
+        $this->assertTrue( $handlerList[ 10 ] instanceof RestorePlaceHoldersToXLIFFLtGt );
+
+    }
+
+    /**
+     * @test
+     */
+    public function testReOrder2() {
+
+        $this->channel->remove( new TwigToPh() );
+        $this->channel->remove( new SprintfToPH() );
+        $this->channel->addFirst( new SprintfToPH() );
+
+        $this->channel->addBefore( new HtmlToPh(), new RubyOnRailsI18n() );
+        $this->channel->remove( new HtmlToPh() );
+
+        $reflection = new ReflectionClass( $this->channel );
+        $property   = $reflection->getProperty( 'handlers' );
+        $property->setAccessible( true );
+        $handlerList = $property->getValue( $this->channel );
+
+        $this->assertTrue( $handlerList[ 0 ] instanceof SprintfToPH );
+        $this->assertTrue( $handlerList[ 1 ] instanceof StandardPHToMateCatCustomPH );
+        $this->assertTrue( $handlerList[ 2 ] instanceof PlaceHoldXliffTags );
+        $this->assertTrue( $handlerList[ 3 ] instanceof LtGtDecode );
+        $this->assertTrue( $handlerList[ 4 ] instanceof RubyOnRailsI18n );
+        $this->assertTrue( $handlerList[ 5 ] instanceof RestoreXliffTagsContent );
+        $this->assertTrue( $handlerList[ 6 ] instanceof RestorePlaceHoldersToXLIFFLtGt );
+
+    }
+
+}
\ No newline at end of file
diff --git a/tests/MapTest.php b/tests/MapTest.php
new file mode 100644
index 0000000..3e5a3c4
--- /dev/null
+++ b/tests/MapTest.php
@@ -0,0 +1,538 @@
+<?php
+
+namespace Matecat\SubFiltering\Tests;
+
+use DomainException;
+use Matecat\SubFiltering\Utils\Map;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Created by PhpStorm.
+ * @author hashashiyyin domenico@translated.net / ostico@gmail.com
+ * Date: 27/05/24
+ * Time: 12:44
+ *
+ */
+class MapTest extends TestCase {
+
+    /**
+     * @test
+     */
+    public function put_test() {
+
+        $m = Map::instance( [ 'k' => 'v' ] );
+
+        $oldValue  = $m->get( 'k' );
+        $old_value = $m->put( 'k', 'pippo' );
+
+        $this->assertEquals( $oldValue, $old_value );
+
+        $new_value = $m->put( '_not_existent_key', 'pippo' );
+
+        $this->assertNull( $new_value );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_for_each() {
+
+        $i = 1;
+        $m = Map::instance( [
+                "1" => "1",
+                "2" => "2",
+                "3" => "3",
+                "4" => "4",
+                "5" => "5",
+                "6" => "6",
+                "7" => "7"
+        ] );
+
+        $m->for_each( function ( $k, $v ) use ( &$i ) {
+            $this->assertEquals( $i, $k );
+            $this->assertEquals( $i, $v );
+            $i++;
+        } );
+
+        $this->assertEquals( 8, $i );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_get_or_default() {
+
+        $m = Map::instance( [
+                "1" => "1",
+                "2" => "2",
+                "3" => "3",
+                "4" => "4",
+                "5" => "5",
+                "6" => "6",
+                "7" => "7"
+        ] );
+
+        $this->assertNull( $m->get( 'not_exists' ) );
+        $this->assertEquals( "my_default", $m->getOrDefault( "not_exists_too", "my_default" ) );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_count_and_clear() {
+        $m = Map::instance( [
+                "1" => "1",
+                "2" => "2",
+                "3" => "3",
+                "4" => "4",
+                "5" => "5",
+                "6" => "6",
+                "7" => "7"
+        ] );
+
+        $this->assertCount( 7, $m );
+        $m->clear();
+        $this->assertCount( 0, $m );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_iterable() {
+
+        $i = 1;
+        $m = Map::instance( [
+                "1" => "1",
+                "2" => "2",
+                "3" => "3",
+                "4" => "4",
+                "5" => "5",
+                "6" => "6",
+                "7" => "7"
+        ] );
+
+        foreach ( $m as $k => $v ) {
+            $this->assertEquals( $i, $k );
+            $this->assertEquals( $i, $v );
+            $i++;
+        }
+
+        $this->assertEquals( 8, $i );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_iterator() {
+
+        $i = 1;
+        $m = Map::instance( [
+                "1" => "1",
+                "2" => "2",
+                "3" => "3",
+                "4" => "4",
+                "5" => "5",
+                "6" => "6",
+                "7" => "7"
+        ] );
+
+        $iterator = $m->getIterator();
+
+        while ( $iterator->valid() ) {
+            $this->assertEquals( $i, $iterator->current() );
+            $this->assertEquals( $i, $iterator->current() );
+            $iterator->next();
+            $i++;
+        }
+        $this->assertEquals( 8, $i );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_accesses() {
+
+        $m = Map::instance( [
+                "1"   => "1",
+                "2"   => "2",
+                "3"   => "3",
+                "4"   => "4",
+                "5"   => "5",
+                "6"   => "6",
+                "7"   => "7",
+                "foo" => "bar",
+        ] );
+
+        $this->assertTrue( $m->containsKey( "foo" ) );
+        $this->assertFalse( $m->containsKey( "ciao" ) );
+
+        $this->assertTrue( $m->containsValue( "bar" ) );
+        $this->assertFalse( $m->containsKey( "pippo" ) );
+
+        $this->assertEquals( 'bar', $m[ "foo" ] );
+        $this->assertEquals( 'bar', $m->offsetGet( 'foo' ) );
+        $this->assertNull( $m[ 'no-exists' ] );
+
+        unset( $m[ 'foo' ] );
+        $this->assertCount( 7, $m );
+
+        $m->offsetUnset( '7' );
+        $this->assertCount( 6, $m );
+
+        $m->offsetSet( 'hello', 'world' );
+        $this->assertCount( 7, $m );
+        $this->assertTrue( $m->offsetExists( 'hello' ) );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_empty() {
+        $m = Map::instance();
+        $this->assertTrue( $m->isEmpty() );
+
+        $this->assertFalse( empty( $m ) );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_put() {
+
+        $m = Map::instance();
+        $this->assertEquals( 0, $m->size() );
+
+        $return = $m->put( "key", 'value' );
+        $this->assertNull( $return );
+        $this->assertEquals( 1, $m->size() );
+
+        $previousValue = $m->putIfAbsent( "key", 'foobar' );
+        $this->assertEquals( "value", $previousValue );
+        $this->assertEquals( "value", $m->get( "key" ) );
+        $this->assertEquals( 1, $m->size() );
+
+        $return = $m->putIfAbsent( "key2", 'value' );
+        $this->assertNull( $return );
+        $this->assertEquals( 2, $m->size() );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_remove() {
+
+        $m = Map::instance( [
+                "1"   => "1",
+                "2"   => "2",
+                "3"   => "3",
+                "4"   => "4",
+                "5"   => "5",
+                "6"   => "6",
+                "7"   => "7",
+                "foo" => "bar",
+        ] );
+
+        $this->assertCount( 8, $m );
+
+        $this->assertTrue( $m->remove( "foo" ) );
+        $this->assertCount( 7, $m );
+
+        $this->assertFalse( $m->remove( "foo" ) );
+        $this->assertCount( 7, $m );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_replace() {
+
+        $m = Map::instance( [
+                "foo" => "bar",
+        ] );
+
+        $this->assertCount( 1, $m );
+
+        $return = $m->replace( "key2", 'value' );
+        $this->assertNull( $return );
+        $this->assertEquals( 1, $m->size() );
+
+        $return = $m->replace( "foo", 'value' );
+        $this->assertNotNull( $return );
+        $this->assertEquals( "bar", $return );
+        $this->assertEquals( 1, $m->size() );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_replace_if_equals() {
+
+        $m = Map::instance( [
+                "foo" => "bar",
+        ] );
+
+        $this->assertCount( 1, $m );
+
+        $return = $m->replaceIfEquals( "key2", 'value', 'buh!' );
+        $this->assertFalse( $return );
+        $this->assertEquals( 1, $m->size() );
+
+        $return = $m->replaceIfEquals( "foo", 'value', 'buh!' );
+        $this->assertFalse( $return );
+        $this->assertEquals( 1, $m->size() );
+
+        $return = $m->replaceIfEquals( "foo", 'new_value', 'bar' );
+        $this->assertTrue( $return );
+        $this->assertEquals( 1, $m->size() );
+        $this->assertEquals( "new_value", $m->get( 'foo' ) );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_replaceAll() {
+
+        $cube = function ( $n ) {
+            return ( $n * $n * $n );
+        };
+
+        $m = Map::instance( [
+                "1" => 1,
+                "2" => 2,
+                "3" => 3,
+                "4" => 4,
+                "5" => 5
+        ] );
+
+        $this->assertCount( 5, $m );
+        $m->replaceAll( $cube );
+        $this->assertCount( 5, $m );
+
+        $this->assertEquals( 1, $m->get( '1' ) );
+        $this->assertEquals( 8, $m->get( '2' ) );
+        $this->assertEquals( 27, $m->get( '3' ) );
+        $this->assertEquals( 64, $m->get( '4' ) );
+        $this->assertEquals( 125, $m->get( '5' ) );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_keys_and_values() {
+
+        $m = Map::instance( [
+                "1" => 1,
+                "2" => 2,
+                "3" => 3,
+                "4" => 4,
+                "5" => 5
+        ] );
+
+        $keys               = [ "1", "2", "3", "4", "5" ];
+        $values             = [ 1, 2, 3, 4, 5, ];
+        $values_wrong_order = [ 1, 2, 4, 5, 3 ];
+
+        $this->assertEquals( $keys, $m->keySet() );
+        $this->assertEquals( $values, $m->values() );
+        $this->assertNotEquals( $values_wrong_order, $m->values() );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_compute() {
+
+        $m = Map::instance( [
+                "1" => 1,
+                "2" => 2,
+                "3" => 3,
+                "4" => 4,
+                "5" => 5
+        ] );
+
+        //Attempts to compute a mapping for the specified key and its current mapped value
+        // (or null if there is no current mapping)
+        $res = $m->compute( 'foo', function ( $k, $v ) {
+            $this->assertEquals( 'foo', $k );
+            $this->assertNull( $v );
+
+            return "pippo";
+        } );
+        $this->assertNull( $res );
+
+        //Attempts to compute a mapping for the specified key and its current mapped value
+        $res = $m->compute( '5', function ( $k, $v ) {
+            $this->assertEquals( '5', $k );
+            $this->assertEquals( 5, $v );
+
+            return "pippo";
+        } );
+        $this->assertEquals( 'pippo', $res );
+
+        //If the function returns null, the mapping is removed (or remains absent if initially absent).
+        $res = $m->compute( '5', function ( $k, $v ) {
+            $this->assertEquals( '5', $k );
+            $this->assertEquals( 'pippo', $v );
+
+            return null;
+        } );
+        $this->assertNull( $res );
+        $this->assertCount( 4, $m );
+
+    }
+
+    /**
+     * @test
+     */
+    public function compute_if_absent() {
+
+        // If the specified key is not already associated with a value (or is mapped to null),
+        // attempts to compute its value using the given mapping function and enters it into this map unless null.
+        $m = Map::instance( [
+                "1" => 1,
+                "2" => 2,
+                "3" => 3,
+                "4" => 4,
+                "5" => 5
+        ] );
+
+        $res = $m->computeIfAbsent( 'foo', function ( $k, $v ) {
+            $this->assertEquals( 'foo', $k );
+            $this->assertNull( $v );
+
+            return "pippo";
+        } );
+        //return the current (existing or computed) value associated with the specified key, or null if the computed value is null
+        $this->assertCount( 6, $m );
+        $this->assertEquals( 'pippo', $res );
+
+        // Not absent, no computation will be performed
+        $res = $m->computeIfAbsent( '5', function ( $k, $v ) {
+            $this->assertFalse( true ); // this will not be called
+
+            return 'ciao';
+        } );
+        $this->assertNull( $res );
+
+
+        //If the function returns null, no mapping is recorded.
+        $res = $m->computeIfAbsent( 'XXXXX', function ( $k, $v ) {
+            $this->assertTrue( true );
+
+            return null;
+        } );
+        $this->assertNull( $res );
+        $this->assertCount( 6, $m );
+
+    }
+
+    /**
+     * @test
+     */
+    public function compute_if_present() {
+
+        //If the value for the specified key is present and non-null, attempts to compute a new mapping given the key and its current mapped value.
+        $m = Map::instance( [
+                "1" => 1,
+                "2" => 2,
+                "3" => 3,
+                "4" => 4,
+                "5" => 5
+        ] );
+
+        $res = $m->computeIfPresent( '5', function ( $k, $v ) {
+            $this->assertEquals( '5', $k );
+            $this->assertEquals( 5, $v );
+
+            return "pippo";
+        } );
+        // return the new value associated with the specified key, or null if none
+        $this->assertCount( 5, $m );
+        $this->assertEquals( 'pippo', $res );
+
+
+        //If the function returns null, the mapping is removed.
+        $res = $m->computeIfPresent( '5', function ( $k, $v ) {
+            $this->assertEquals( '5', $k );
+            $this->assertEquals( 'pippo', $v );
+
+            return null;
+        } );
+        // return null and remove the mapping
+        $this->assertCount( 4, $m );
+        $this->assertNull( $res );
+
+
+        // if no mapping is present, the callable function will not be invoked
+        $res = $m->computeIfPresent( '5', function ( $k, $v ) {
+            $this->assertFalse( true ); // this will not be called
+
+            return null;
+        } );
+        $this->assertNull( $res );
+        $this->assertCount( 4, $m );
+
+    }
+
+    /**
+     * @test
+     */
+    public function test_pu_all() {
+
+        $m = Map::instance( [
+                "1" => 1,
+                "2" => 2
+        ] );
+        $this->assertCount( 2, $m );
+        $m->putAll( [
+                "3" => 3,
+                "4" => 4,
+                "5" => 5
+        ] );
+        $this->assertCount( 5, $m );
+        $this->assertEquals( 1, '1' );
+        $this->assertEquals( 3, '3' );
+        $this->assertEquals( 5, '5' );
+    }
+
+    /**
+     * @test
+     */
+    public function test_clone() {
+
+        $m = Map::instance( [
+                "1" => 1,
+                "2" => 2
+        ] );
+
+        $m1 = clone $m;
+
+        $this->assertEquals( $m, $m1 );
+        $this->assertNotSame( $m, $m1 );
+
+    }
+
+    /**
+     * @test
+     */
+    public function no_map_exception() {
+        $this->expectException( DomainException::class );
+        $this->expectExceptionMessage( 'Invalid map provided' );
+        Map::instance( [ 1, 2, 3 ] );
+    }
+
+}
\ No newline at end of file
diff --git a/tests/MateCatSubFilteringTest.php b/tests/MateCatSubFilteringTest.php
index d8a74b1..889f59b 100644
--- a/tests/MateCatSubFilteringTest.php
+++ b/tests/MateCatSubFilteringTest.php
@@ -824,7 +824,7 @@ public function testSmartCount() {
         $Filter = MateCatFilter::getInstance( new FeatureSet( [ new AirbnbFeature() ] ), 'en-EN', 'et-ET', [] );
 
         $db_segment      = '%{smart_count} discount||||%{smart_count} discounts';
-        $segment_from_UI = '<ph id="mtc_1" ctype="x-percent-variable" equiv-text="base64:JXtzbWFydF9jb3VudH0="/> discount<ph id="mtc_2" ctype="x-smart-count" equiv-text="base64:fHx8fA=="/><ph id="mtc_3" ctype="x-percent-variable" equiv-text="base64:JXtzbWFydF9jb3VudH0="/> discounts';
+        $segment_from_UI = '<ph id="mtc_1" ctype="' . CTypeEnum::RUBY_ON_RAILS . '" equiv-text="base64:JXtzbWFydF9jb3VudH0="/> discount<ph id="mtc_2" ctype="x-smart-count" equiv-text="base64:fHx8fA=="/><ph id="mtc_3" ctype="' . CTypeEnum::RUBY_ON_RAILS . '" equiv-text="base64:JXtzbWFydF9jb3VudH0="/> discounts';
 
         $l1_segment = $Filter->fromLayer0ToLayer1( $db_segment );
 
@@ -1297,7 +1297,7 @@ public function layer1ShouldWorkWithMalformedPhTags() {
      */
     public function layer2SShouldWorkWithMalformedPhTags() {
 
-        $filter  = $this->getFilterInstance(['xxx']);
+        $filter  = $this->getFilterInstance( [ 'yyy' => 'xxx' ] );
         $segment = 'not <ph id="1" dataRef="pippo"> valid';
 
         $segmentL2 = $filter->fromLayer0ToLayer2( $segment );
@@ -1314,12 +1314,12 @@ public function when_empty_equiv_text_shgould_put_NULL_in_converted_ph() {
                 "source3" => '&amp;lt;br&amp;gt;',
         ];
 
-        $filter  = $this->getFilterInstance($map);
+        $filter = $this->getFilterInstance( $map );
 
-        $string       = 'Hola <ph id="source1" dataRef="source1" equiv-text=""/>';
-        $expected     = 'Hola <ph id="mtc_1" ctype="' . CTypeEnum::ORIGINAL_SELF_CLOSE_PH_WITH_EQUIV_TEXT . '" x-orig="PHBoIGlkPSJzb3VyY2UxIiBkYXRhUmVmPSJzb3VyY2UxIiBlcXVpdi10ZXh0PSIiLz4=" equiv-text="base64:TlVMTA=="/>';
+        $string   = 'Hola <ph id="source1" dataRef="source1" equiv-text=""/>';
+        $expected = 'Hola <ph id="mtc_1" ctype="' . CTypeEnum::ORIGINAL_SELF_CLOSE_PH_WITH_EQUIV_TEXT . '" x-orig="PHBoIGlkPSJzb3VyY2UxIiBkYXRhUmVmPSJzb3VyY2UxIiBlcXVpdi10ZXh0PSIiLz4=" equiv-text="base64:TlVMTA=="/>';
 
-        $layer2 = $filter->fromLayer0ToLayer2( $string );
+        $layer2        = $filter->fromLayer0ToLayer2( $string );
         $convertedBack = $filter->fromLayer2ToLayer0( $layer2 );
 
         $this->assertEquals( $expected, $layer2 );
@@ -1327,4 +1327,47 @@ public function when_empty_equiv_text_shgould_put_NULL_in_converted_ph() {
 
     }
 
+    /**
+     * @test
+     */
+    public function should_work_with_real_pc_case() {
+
+        $segment    = '<pc id="1b" type="fmt" subType="m:b">Ready to get started?</pc>';
+        $segment_UI = '<ph id="mtc_1" ctype="x-original_pc_open" equiv-text="base64:PHBjIGlkPSIxYiIgdHlwZT0iZm10IiBzdWJUeXBlPSJtOmIiPg=="/>Ready to get started?<ph id="mtc_2" ctype="x-original_pc_close" equiv-text="base64:PC9wYz4="/>';
+
+        $filter = $this->getFilterInstance( [] );
+
+        $segmentL1 = $filter->fromLayer0ToLayer1( $segment );
+        $this->assertEquals( $segment, $filter->fromLayer1ToLayer0( $segmentL1 ) );
+
+
+        $segmentL2 = $filter->fromLayer0ToLayer2( $segment );
+        $this->assertEquals( $segmentL2, $filter->fromLayer1ToLayer2( $segmentL1 ) );
+        $this->assertEquals( $segment_UI, $segmentL2 );
+        $this->assertEquals( $segment, $filter->fromLayer2ToLayer0( $segmentL2 ) );
+        $this->assertEquals( $segmentL1, $filter->fromLayer2ToLayer1( $segmentL2 ) );
+
+    }
+
+    /**
+     * @test
+     * @throws Exception
+     */
+    public function testRubyOnRails() {
+        $segment = 'For the %{first_ruby_variable} site %{{second_bnb_variable}}, is ok.';
+        $forUI   = 'For the <ph id="mtc_1" ctype="' . CTypeEnum::RUBY_ON_RAILS . '" equiv-text="base64:JXtmaXJzdF9ydWJ5X3ZhcmlhYmxlfQ=="/> site <ph id="mtc_2" ctype="' . CTypeEnum::PERCENT_VARIABLE . '" equiv-text="base64:JXt7c2Vjb25kX2JuYl92YXJpYWJsZX19"/>, is ok.';
+
+        $filter = $this->getFilterInstance();
+        $segmentL1 = $filter->fromLayer0ToLayer1( $segment );
+        $this->assertEquals( $segment, $filter->fromLayer1ToLayer0( $segmentL1 ) );
+
+
+        $segmentL2 = $filter->fromLayer0ToLayer2( $segment );
+        $this->assertEquals( $segmentL2, $filter->fromLayer1ToLayer2( $segmentL1 ) );
+        $this->assertEquals( $forUI, $segmentL2 );
+        $this->assertEquals( $segment, $filter->fromLayer2ToLayer0( $segmentL2 ) );
+        $this->assertEquals( $segmentL1, $filter->fromLayer2ToLayer1( $segmentL2 ) );
+
+    }
+
 }
diff --git a/tests/Mocks/Features/AirbnbFeature.php b/tests/Mocks/Features/AirbnbFeature.php
index f3d4502..018b971 100644
--- a/tests/Mocks/Features/AirbnbFeature.php
+++ b/tests/Mocks/Features/AirbnbFeature.php
@@ -3,7 +3,6 @@
 namespace Matecat\SubFiltering\Tests\Mocks\Features;
 
 use Matecat\SubFiltering\Commons\Pipeline;
-use Matecat\SubFiltering\Filters\HtmlToPh;
 use Matecat\SubFiltering\Filters\SmartCounts;
 use Matecat\SubFiltering\Filters\Variables;
 
diff --git a/tests/MyMemorySubFilteringTest.php b/tests/MyMemorySubFilteringTest.php
index 11f922e..361cf31 100644
--- a/tests/MyMemorySubFilteringTest.php
+++ b/tests/MyMemorySubFilteringTest.php
@@ -27,7 +27,7 @@ public function testVariablesWithHTML() {
         $filter = $this->getFilterInstance();
 
         $db_segment      = 'Airbnb account.%{\n}%{&lt;br&gt;}%{\n}1) From ';
-        $segment_from_UI = 'Airbnb account.<ph id="mtc_1" ctype="' . CTypeEnum::PERCENT_VARIABLE . '" equiv-text="base64:JXtcbn0="/>%{<ph id="mtc_2" ctype="' . CTypeEnum::HTML . '" equiv-text="base64:Jmx0O2JyJmd0Ow=="/>}<ph id="mtc_3" ctype="' . CTypeEnum::PERCENT_VARIABLE . '" equiv-text="base64:JXtcbn0="/>1) From ';
+        $segment_from_UI = 'Airbnb account.<ph id="mtc_1" ctype="' . CTypeEnum::RUBY_ON_RAILS . '" equiv-text="base64:JXtcbn0="/>%{<ph id="mtc_2" ctype="' . CTypeEnum::HTML . '" equiv-text="base64:Jmx0O2JyJmd0Ow=="/>}<ph id="mtc_3" ctype="' . CTypeEnum::RUBY_ON_RAILS . '" equiv-text="base64:JXtcbn0="/>1) From ';
 
         $this->assertEquals( $db_segment, $filter->fromLayer1ToLayer0( $segment_from_UI ) );
         $this->assertEquals( $segment_from_UI, $filter->fromLayer0ToLayer1( $db_segment, 'airbnb' ) );
diff --git a/tests/TestHandlersOrder.php b/tests/TestHandlersOrder.php
deleted file mode 100644
index 599bcc5..0000000
--- a/tests/TestHandlersOrder.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * @author ostico domenico@translated.net / ostico@gmail.com
- * Date: 08/02/22
- * Time: 18:30
- *
- */
-
-namespace Matecat\SubFiltering\Tests;
-
-use Matecat\SubFiltering\Commons\Pipeline;
-use Matecat\SubFiltering\Filters\HtmlToPh;
-use Matecat\SubFiltering\Filters\LtGtDecode;
-use Matecat\SubFiltering\Filters\Percentages;
-use Matecat\SubFiltering\Filters\PlaceHoldXliffTags;
-use Matecat\SubFiltering\Filters\RestorePlaceHoldersToXLIFFLtGt;
-use Matecat\SubFiltering\Filters\RestoreXliffTagsContent;
-use Matecat\SubFiltering\Filters\RubyOnRailsI18n;
-use Matecat\SubFiltering\Filters\SingleCurlyBracketsToPh;
-use Matecat\SubFiltering\Filters\SprintfToPH;
-use Matecat\SubFiltering\Filters\StandardPHToMateCatCustomPH;
-use Matecat\SubFiltering\Filters\TwigToPh;
-use PHPUnit\Framework\TestCase;
-use ReflectionClass;
-
-class TestHandlersOrder extends TestCase {
-
-    /**
-     * @var Pipeline
-     */
-    protected $channel;
-
-    public function setUp() {
-        $this->channel = new Pipeline( 'it-IT', 'en-US', [] );
-        $this->channel->addLast( new StandardPHToMateCatCustomPH() );
-        $this->channel->addLast( new PlaceHoldXliffTags() );
-        $this->channel->addLast( new LtGtDecode() );
-        $this->channel->addLast( new HtmlToPh() );
-        $this->channel->addLast( new TwigToPh() );
-        $this->channel->addLast( new SprintfToPH() );
-        $this->channel->addLast( new RestoreXliffTagsContent() );
-        $this->channel->addLast( new RestorePlaceHoldersToXLIFFLtGt() );
-    }
-
-    public function testReOrder() {
-
-        $this->channel->remove( new TwigToPh() );
-        $this->channel->remove( new SprintfToPH() );
-
-        $this->channel->addAfter( new HtmlToPh(), new RubyOnRailsI18n() );
-        $this->channel->addAfter( new RubyOnRailsI18n(), new Percentages() );
-        $this->channel->addAfter( new Percentages(), new SprintfToPH() );
-        $this->channel->addAfter( new SprintfToPH(), new TwigToPh() );
-        $this->channel->addAfter( new TwigToPh(), new SingleCurlyBracketsToPh() );
-
-        $reflection = new \ReflectionClass( $this->channel );
-        $property   = $reflection->getProperty( 'handlers' );
-        $property->setAccessible( true );
-        $handlersList = $property->getValue( $this->channel );
-
-        $this->assertTrue( $handlersList[ 0 ] instanceof StandardPHToMateCatCustomPH );
-        $this->assertTrue( $handlersList[ 1 ] instanceof PlaceHoldXliffTags );
-        $this->assertTrue( $handlersList[ 2 ] instanceof LtGtDecode );
-        $this->assertTrue( $handlersList[ 3 ] instanceof HtmlToPh );
-        $this->assertTrue( $handlersList[ 4 ] instanceof RubyOnRailsI18n );
-        $this->assertTrue( $handlersList[ 5 ] instanceof Percentages );
-        $this->assertTrue( $handlersList[ 6 ] instanceof SprintfToPH );
-        $this->assertTrue( $handlersList[ 7 ] instanceof TwigToPh );
-        $this->assertTrue( $handlersList[ 8 ] instanceof SingleCurlyBracketsToPh );
-        $this->assertTrue( $handlersList[ 9 ] instanceof RestoreXliffTagsContent );
-        $this->assertTrue( $handlersList[ 10 ] instanceof RestorePlaceHoldersToXLIFFLtGt );
-
-    }
-
-}
\ No newline at end of file