Adding X() extension method and tests