diff --git a/tests/src/App/Expression.cpp b/tests/src/App/Expression.cpp
index 8a7c1a50fb..fb04c5b3cd 100644
--- a/tests/src/App/Expression.cpp
+++ b/tests/src/App/Expression.cpp
@@ -15,7 +15,237 @@ TEST(Expression, tokenize)
     EXPECT_EQ(App::ExpressionTokenizer().perform(QString::fromUtf8("0.00000 deg"), 11), QString::fromLatin1("deg"));
 }
 
+TEST(Expression, tokenizeQuantity)
+{
+    auto result = App::ExpressionParser::tokenize("0.00000 deg");
+    EXPECT_EQ(result.size(), 2);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::NUM);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "0.00000");
+    EXPECT_EQ(std::get<0>(result[1]), App::ExpressionParser::UNIT);
+    EXPECT_EQ(std::get<1>(result[1]), 8);
+    EXPECT_EQ(std::get<2>(result[1]), "deg");
+}
+
+TEST(Expression, tokenizeFunc)
+{
+    auto result = App::ExpressionParser::tokenize("sin(0.00000)");
+    EXPECT_EQ(result.size(), 3);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::FUNC);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "sin(");
+    EXPECT_EQ(std::get<0>(result[1]), App::ExpressionParser::NUM);
+    EXPECT_EQ(std::get<1>(result[1]), 4);
+    EXPECT_EQ(std::get<2>(result[1]), "0.00000");
+    EXPECT_EQ(std::get<1>(result[2]), 11);
+    EXPECT_EQ(std::get<2>(result[2]), ")");
+}
+
+TEST(Expression, tokenizeOne)
+{
+    auto result = App::ExpressionParser::tokenize("1");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::ONE);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "1");
+}
+
+TEST(Expression, tokenizeNum)
+{
+    auto result = App::ExpressionParser::tokenize("1.2341");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::NUM);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "1.2341");
+}
+
+TEST(Expression, tokenizeID)
+{
+    auto result = App::ExpressionParser::tokenize("Something");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::IDENTIFIER);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "Something");
+}
+
+TEST(Expression, tokenizeUnit)
+{
+    auto result = App::ExpressionParser::tokenize("km");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::UNIT);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "km");
+}
+
+TEST(Expression, tokenizeUSUnit)
+{
+    auto result = App::ExpressionParser::tokenize("\"");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::USUNIT);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "\"");
+}
+
+TEST(Expression, tokenizeInt)
+{
+    auto result = App::ExpressionParser::tokenize("123456");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::INTEGER);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "123456");
+}
+
 TEST(Expression, tokenizePi)
+{
+    auto result = App::ExpressionParser::tokenize("pi");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::CONSTANT);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "pi");
+}
+
+TEST(Expression, tokenizeE)
+{
+    auto result = App::ExpressionParser::tokenize("e");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::CONSTANT);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "e");
+}
+
+TEST(Expression, tokenizeConstant)
+{
+    auto result = App::ExpressionParser::tokenize("True False true false None");
+    EXPECT_EQ(result.size(), 5);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::CONSTANT);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "True");
+    EXPECT_EQ(std::get<0>(result[1]), App::ExpressionParser::CONSTANT);
+    EXPECT_EQ(std::get<0>(result[2]), App::ExpressionParser::CONSTANT);
+    EXPECT_EQ(std::get<0>(result[3]), App::ExpressionParser::CONSTANT);
+    EXPECT_EQ(std::get<0>(result[4]), App::ExpressionParser::CONSTANT);
+}
+
+TEST(Expression, tokenizeEqual)
+{
+    auto result = App::ExpressionParser::tokenize("==");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::EQ);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "==");
+}
+
+TEST(Expression, tokenizeNotEqual)
+{
+    auto result = App::ExpressionParser::tokenize("!=");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::NEQ);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "!=");
+}
+
+TEST(Expression, tokenizeLessThan)
+{
+    auto result = App::ExpressionParser::tokenize("<");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::LT);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "<");
+}
+
+TEST(Expression, tokenizeLessThanEqual)
+{
+    auto result = App::ExpressionParser::tokenize("<=");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::LTE);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "<=");
+}
+
+TEST(Expression, tokenizeGreaterThan)
+{
+    auto result = App::ExpressionParser::tokenize(">");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::GT);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), ">");
+}
+
+TEST(Expression, tokenizeGreaterThanEqual)
+{
+    auto result = App::ExpressionParser::tokenize(">=");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::GTE);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), ">=");
+}
+
+TEST(Expression, tokenizeMinus)
+{
+    auto result = App::ExpressionParser::tokenize("1-1");
+    EXPECT_EQ(result.size(), 3);
+    EXPECT_EQ(std::get<0>(result[1]), App::ExpressionParser::MINUSSIGN);
+    EXPECT_EQ(std::get<1>(result[1]), 1);
+    EXPECT_EQ(std::get<2>(result[1]), "-");
+}
+
+TEST(Expression, tokenizeCell1)
+{
+    auto result = App::ExpressionParser::tokenize("$A$12");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::CELLADDRESS);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "$A$12");
+}
+
+TEST(Expression, tokenizeCell2)
+{
+    auto result = App::ExpressionParser::tokenize("A$12");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::CELLADDRESS);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "A$12");
+}
+
+TEST(Expression, tokenizeCell3)
+{
+    auto result = App::ExpressionParser::tokenize("$A12");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::CELLADDRESS);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "$A12");
+}
+
+TEST(Expression, tokenizeString)
+{
+    auto result = App::ExpressionParser::tokenize("<<Test>>");
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(std::get<0>(result[0]), App::ExpressionParser::STRING);
+    EXPECT_EQ(std::get<1>(result[0]), 0);
+    EXPECT_EQ(std::get<2>(result[0]), "<<Test>>");
+}
+
+TEST(Expression, tokenizeExponent)
+{
+    // TODO
+}
+
+TEST(Expression, tokenizeNumAndUnit)
+{
+    // TODO
+}
+
+TEST(Expression, tokenizePos)
+{
+    // TODO
+}
+
+TEST(Expression, tokenizeNeg)
+{
+    // TODO
+}
+
+TEST(Expression, tokenizePi_rad)
 {
     EXPECT_EQ(App::ExpressionTokenizer().perform(QString::fromLatin1("p"), 1), QString::fromLatin1("p"));
     EXPECT_EQ(App::ExpressionTokenizer().perform(QString::fromLatin1("pi"), 2), QString());