diff --git a/poincare/test/expression_serialization.cpp b/poincare/test/expression_serialization.cpp
index 2d9c74b31..df7c115d3 100644
--- a/poincare/test/expression_serialization.cpp
+++ b/poincare/test/expression_serialization.cpp
@@ -134,11 +134,3 @@ QUIZ_CASE(poincare_serialization_factorial) {
   assert_expression_serialize_to(Factorial::Builder(Division::Builder(Constant::Builder(UCodePointGreekSmallLetterPi),Rational::Builder(3))), "\u0012π/3\u0013!");
   assert_expression_serialize_to(Factorial::Builder(Power::Builder(Constant::Builder(UCodePointGreekSmallLetterPi),Rational::Builder(3))), "\u0012π^3\u0013!");
 }
-
-QUIZ_CASE(poincare_serialization_mutiplication_implicite) {
-  assert_expression_serialize_to(Multiplication::Builder(Division::Builder(Rational::Builder(2), Constant::Builder(UCodePointGreekSmallLetterPi)),Rational::Builder(3)), "\u00122/π\u00133");
-  assert_expression_serialize_to(Multiplication::Builder(Power::Builder(Rational::Builder(2), Constant::Builder(UCodePointGreekSmallLetterPi)),Rational::Builder(3)), "\u00122^π\u00133");
-
-
-}
-
diff --git a/poincare/test/expression_to_layout.cpp b/poincare/test/expression_to_layout.cpp
index a947c59c5..ada674b45 100644
--- a/poincare/test/expression_to_layout.cpp
+++ b/poincare/test/expression_to_layout.cpp
@@ -6,7 +6,6 @@
 
 using namespace Poincare;
 
-// TODO: ADD TESTS
 void assert_parsed_expression_layouts_to(const char * expression, Layout l) {
   Expression e = parse_expression(expression, true);
   Layout el = e.createLayout(DecimalMode, PrintFloat::k_numberOfStoredSignificantDigits);
@@ -31,6 +30,56 @@ QUIZ_CASE(poincare_expression_to_layout) {
   assert_parsed_expression_layouts_to("1^2", HorizontalLayout::Builder(CodePointLayout::Builder('1'), VerticalOffsetLayout::Builder(CodePointLayout::Builder('2'), VerticalOffsetLayoutNode::Position::Superscript)));
 }
 
+void assert_expression_layouts_and_serializes_to(Expression expression, const char * serialization) {
+  Layout layout = expression.createLayout(DecimalMode, PrintFloat::k_numberOfStoredSignificantDigits);
+  assert_layout_serialize_to(layout, serialization);
+}
+
+QUIZ_CASE(poincare_expression_to_layout_multiplication_operator) {
+  // Decimal x OneLetter
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Decimal::Builder("2", -4), Symbol::Builder('a')), "0.0002a");
+  // Decimal x Decimal
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Decimal::Builder("2", -4), Decimal::Builder("2", -4)), "0.0002×0.0002");
+  // Integer x Integer
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Rational::Builder(2), Rational::Builder(1)), "2×1");
+  // Integer x MoreLetters
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Rational::Builder(2), Symbol::Builder("abc", 3)), "2·abc");
+  // Integer x fraction
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Rational::Builder(2), Rational::Builder(2, 3)), "2×\u0012\u00122\u0013/\u00123\u0013\u0013");
+  // BoundaryPunctuation x Integer
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(AbsoluteValue::Builder(Rational::Builder(2)), Rational::Builder(1)), "abs\u00122\u0013×1");
+  // BoundaryPunctuation x OneLetter
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(BinomialCoefficient::Builder(Rational::Builder(2), Rational::Builder(3)), Symbol::Builder('a')), "binomial\u0012\u00122\u0013,\u00123\u0013\u0013a");
+  // BoundaryPunctuation x Root
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Cosine::Builder(Rational::Builder(2)), SquareRoot::Builder(Rational::Builder(2))), "cos(2)√\u00122\u0013");
+
+  // 2√(2)
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Rational::Builder(2), SquareRoot::Builder(Rational::Builder(2))), "2√\u00122\u0013");
+  // √(2)x2
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(SquareRoot::Builder(Rational::Builder(2)), Rational::Builder(2)), "√\u00122\u0013×2");
+  // 2π
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Rational::Builder(2), Constant::Builder(UCodePointGreekSmallLetterPi)), "2π");
+  // π·𝐢
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Constant::Builder(UCodePointGreekSmallLetterPi), Constant::Builder(UCodePointMathematicalBoldSmallI)), "π·𝐢");
+  // conj(2)√(2)
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Conjugate::Builder(Rational::Builder(2)), SquareRoot::Builder(Rational::Builder(2))), "conj\u00122\u0013√\u00122\u0013");
+  //√(2)a!
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(SquareRoot::Builder(Rational::Builder(2)), Factorial::Builder(Symbol::Builder('a'))), "√\u00122\u0013a!");
+  // a 2/3
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Symbol::Builder('a'), Division::Builder(Rational::Builder(2), Rational::Builder(3))), "a\u0012\u00122\u0013/\u00123\u0013\u0013");
+  // (1+π)a
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Parenthesis::Builder(Addition::Builder(Rational::Builder(1), Constant::Builder(UCodePointGreekSmallLetterPi))), Symbol::Builder('a')), "(1+π)a");
+
+  // Operator contamination (if two operands needs x, all operands are separated by a x)
+  // 1x2xa
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Rational::Builder(1), Rational::Builder(2), Symbol::Builder('a')), "1×2×a");
+  // 2·π·a
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Rational::Builder(2), Constant::Builder(UCodePointGreekSmallLetterPi), Symbol::Builder('a')), "2·π·a");
+  // 2(1+a)(1+π)
+  assert_expression_layouts_and_serializes_to(Multiplication::Builder(Rational::Builder(2), Parenthesis::Builder(Addition::Builder(Rational::Builder(1), Symbol::Builder('a'))), Parenthesis::Builder(Addition::Builder(Rational::Builder(1), Constant::Builder(UCodePointGreekSmallLetterPi)))), "2(1+a)(1+π)");
+
+}
+
 void assert_parsed_expression_layout_serialize_to_self(const char * expressionLayout) {
   Expression e = parse_expression(expressionLayout, true);
   Layout el = e.createLayout(DecimalMode, PrintFloat::k_numberOfStoredSignificantDigits);