diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.ilk b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.ilk
index b7869ad..9fcc25b 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.ilk and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.ilk differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.pdb
index f0e9312..de363c1 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.pdb differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.vc.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.vc.pdb
index 0d886b9..d6cbc56 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.vc.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/05_word_wrapp/debug/05_word_wrapp.vc.pdb differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.ilk b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.ilk
index 86f7abf..b45b8c7 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.ilk and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.ilk differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.pdb
index 419cd9e..e323604 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.pdb differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.vc.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.vc.pdb
index b205ae8..3a1fdd4 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.vc.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/homework/06_bank_ocr/debug/06_bank_ocr.vc.pdb differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.ilk b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.ilk
index ebaf6dc..8137a05 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.ilk and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.ilk differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.pdb
index 36141c5..f883dd1 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.pdb differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.vc.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.vc.pdb
index 4892c2d..0ba7332 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.vc.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/02_word_count/debug/02_word_count.vc.pdb differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.ilk b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.ilk
index b5efbe7..65a4149 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.ilk and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.ilk differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.pdb
index a74695f..b3ab583 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.pdb differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.vc.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.vc.pdb
index 647130e..76ecfa0 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.vc.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/03_anagram/debug/03_anagram.vc.pdb differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.ilk b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.ilk
index 911a8a9..ed34d24 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.ilk and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.ilk differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.pdb
index 13edd25..4247bb8 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.pdb differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.vc.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.vc.pdb
index 74c0997..3b19df6 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.vc.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/04_trinary_numbers/debug/04_trinary_numbers.vc.pdb differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.ilk b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.ilk
index 7091ff8..f561bdb 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.ilk and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.ilk differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.pdb
index e5df563..0f4e38b 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.pdb differ
diff --git a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.vc.pdb b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.vc.pdb
index 3a83b02..37456cc 100644
Binary files a/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.vc.pdb and b/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug/workshops/05_word_wrapp/debug/05_word_wrapp.vc.pdb differ
diff --git a/tdd_intro/tdd_intro.pro.user b/tdd_intro/tdd_intro.pro.user
index a2f1674..0f40d6d 100644
--- a/tdd_intro/tdd_intro.pro.user
+++ b/tdd_intro/tdd_intro.pro.user
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.0, 2018-04-17T19:54:55. -->
+<!-- Written by QtCreator 4.5.0, 2018-06-19T00:29:45. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{a9e7f687-ac9f-466e-a5b0-c81b575a0a1d}</value>
+  <value type="QByteArray">{950e75d0-15c4-4cbb-8e75-9217fe27f405}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -59,14 +59,14 @@
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
   <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.7.0 (windows)</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.7.0 (windows)</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{bb54e87c-a17e-4f34-bfa2-da2794ff8a10}</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.10.0 MSVC2015 32bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.10.0 MSVC2015 32bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5100.win32_msvc2015_kit</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">11</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/ertev/Desktop/TDD course/tdd-course-2/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -120,7 +120,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/ertev/Desktop/TDD course/tdd-course-2/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -174,7 +174,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/ertev/Desktop/TDD course/tdd-course-2/build-tdd_intro-Desktop_Qt_5_10_0_MSVC2015_32bit-Profile</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -286,13 +286,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">chatclient</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/cleanroom/chatclient/chatclient.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/cleanroom/chatclient/chatclient.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">cleanroom/chatclient/chatclient.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/cleanroom/chatclient</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -344,13 +344,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">01_bob</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/homework/01_bob/01_bob.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/homework/01_bob/01_bob.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">homework/01_bob/01_bob.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/homework/01_bob</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -402,13 +402,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">02_word_count</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/workshops/02_word_count/02_word_count.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/workshops/02_word_count/02_word_count.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">workshops/02_word_count/02_word_count.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/workshops/02_word_count</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -460,13 +460,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">03_anagram</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">03_anagram2</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/workshops/03_anagram/03_anagram.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/workshops/03_anagram/03_anagram.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">workshops/03_anagram/03_anagram.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/workshops/03_anagram</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -518,13 +518,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">04_trinary_numbers</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">04_trinary_numbers2</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/workshops/04_trinary_numbers/04_trinary_numbers.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/workshops/04_trinary_numbers/04_trinary_numbers.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">workshops/04_trinary_numbers/04_trinary_numbers.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/workshops/04_trinary_numbers</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -576,13 +576,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">05_word_wrapp</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">05_word_wrapp2</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/workshops/05_word_wrapp/05_word_wrapp.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/workshops/05_word_wrapp/05_word_wrapp.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">workshops/05_word_wrapp/05_word_wrapp.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/workshops/05_word_wrapp</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -634,13 +634,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">02_leap_year</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/homework/02_leap_year/02_leap_year.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/homework/02_leap_year/02_leap_year.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">homework/02_leap_year/02_leap_year.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/homework/02_leap_year</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -692,13 +692,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">03_anagram</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/homework/03_anagram/03_anagram.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/homework/03_anagram/03_anagram.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">homework/03_anagram/03_anagram.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/homework/03_anagram</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -750,13 +750,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">04_trinary_numbers</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/homework/04_trinary_numbers/04_trinary_numbers.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/homework/04_trinary_numbers/04_trinary_numbers.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">homework/04_trinary_numbers/04_trinary_numbers.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/homework/04_trinary_numbers</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -808,13 +808,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">05_word_wrapp</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/homework/05_word_wrapp/05_word_wrapp.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/homework/05_word_wrapp/05_word_wrapp.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">homework/05_word_wrapp/05_word_wrapp.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/homework/05_word_wrapp</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -866,13 +866,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">06_bank_ocr</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/homework/06_bank_ocr/06_bank_ocr.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/homework/06_bank_ocr/06_bank_ocr.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">homework/06_bank_ocr/06_bank_ocr.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/homework/06_bank_ocr</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -924,13 +924,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">07_filecopier</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/homework/07_filecopier/07_filecopier.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/homework/07_filecopier/07_filecopier.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">homework/07_filecopier/07_filecopier.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/homework/07_filecopier</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -982,13 +982,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">08_timer</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/homework/08_timer/08_timer.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/homework/08_timer/08_timer.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">homework/08_timer/08_timer.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/homework/08_timer</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -1040,13 +1040,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">01_fizz_buzz</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Study/tdd-course-2/tdd_intro/workshops/01_fizz_buzz/01_fizz_buzz.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/ertev/Desktop/TDD course/tdd-course-2/tdd_intro/workshops/01_fizz_buzz/01_fizz_buzz.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">workshops/01_fizz_buzz/01_fizz_buzz.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Study/tdd-course-2/build-tdd_intro-Qt_5_7_0_windows-Debug/workshops/01_fizz_buzz</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
diff --git a/tdd_intro/workshops/07_coffee/test.cpp b/tdd_intro/workshops/07_coffee/test.cpp
index fb96119..f8bff61 100644
--- a/tdd_intro/workshops/07_coffee/test.cpp
+++ b/tdd_intro/workshops/07_coffee/test.cpp
@@ -42,7 +42,7 @@ class ICoffeCore
     virtual void AddWater(int gram, int temperature) = 0;
     virtual void AddSugar(int gram) = 0;
     virtual void AddCoffee(int gram) = 0;
-    virtual void AddMilk(int gram) = 0;
+    virtual void AddMilk(int gram, int temperature) = 0;
     virtual void AddMilkFoam(int gram) = 0;
     virtual void AddChocolate(int gram) = 0;
     virtual void AddCream(int gram) = 0;
@@ -54,7 +54,7 @@ class CoffeeCoreMock : public ICoffeCore
     MOCK_METHOD2(AddWater, void(int, int));
     MOCK_METHOD1(AddSugar, void(int));
     MOCK_METHOD1(AddCoffee, void(int));
-    MOCK_METHOD1(AddMilk, void(int));
+    MOCK_METHOD2(AddMilk, void(int, int));
     MOCK_METHOD1(AddMilkFoam, void(int));
     MOCK_METHOD1(AddChocolate, void(int));
     MOCK_METHOD1(AddCream, void(int));
@@ -76,6 +76,9 @@ class CoffeeMachine
     void CreateBigCup();
     void CreateHotWaterCup();
     void CreateAmericano();
+    void CreateCappuccino();
+    void CreateLatte();
+    void CreateMarochino();
 private:
     ICoffeCore& m_core;
     CupSize m_size;
@@ -108,11 +111,44 @@ void CoffeeMachine::CreateAmericano()
     {
         throw std::runtime_error("cap is empty");
     }
-    m_core.AddWater(m_size / 2, 60);
+    m_core.AddWater(m_size / 3, 60);
+    m_core.AddCoffee((2*m_size) / 3);
+}
+
+void CoffeeMachine::CreateCappuccino()
+{
+    if(m_size == CupSizeInvalid)
+    {
+        throw std::runtime_error("cap is empty");
+    }
+    m_core.AddMilk(m_size / 3, 80);
+    m_core.AddCoffee(m_size / 3);
+    m_core.AddMilkFoam(m_size / 3);
+}
+
+void CoffeeMachine::CreateLatte()
+{
+    if(m_size == CupSizeInvalid)
+    {
+        throw std::runtime_error("cap is empty");
+    }
+    m_core.AddMilk(m_size / 4, 90);
     m_core.AddCoffee(m_size / 2);
+    m_core.AddMilkFoam(m_size / 4);
+}
+
+void CoffeeMachine::CreateMarochino()
+{
+    if(m_size == CupSizeInvalid)
+    {
+        throw std::runtime_error("cap is empty");
+    }
+    m_core.AddChocolate(m_size / 4);
+    m_core.AddCoffee(m_size / 4);
+    m_core.AddMilkFoam(m_size / 4);
 }
 
-TEST(CoffeCoretest, CreateHotWater)
+TEST(CoffeeCoretest, CreateHotWater)
 {
     CoffeeCoreMock mock;
     CoffeeMachine machine(mock);
@@ -122,31 +158,29 @@ TEST(CoffeCoretest, CreateHotWater)
     machine.CreateHotWaterCup();
 }
 
-// FIX: sequence
-//- americano: water & coffee 1:2 or 1:3. Water temp 60C
-TEST(CoffeCoretest, CreateAmericanoBig)
+TEST(CoffeeCoretest, CreateAmericanoBig)
 {
     CoffeeCoreMock mock;
     CoffeeMachine machine(mock);
 
-    EXPECT_CALL(mock, AddWater(CupSizeBig / 2, 60)).Times(1);
-    EXPECT_CALL(mock, AddCoffee(CupSizeBig / 2)).Times(1);
+    EXPECT_CALL(mock, AddWater(CupSizeBig / 3, 60)).Times(1);
+    EXPECT_CALL(mock, AddCoffee((2*CupSizeBig) / 3)).Times(1);
     machine.CreateBigCup();
     machine.CreateAmericano();
 }
 
-TEST(CoffeCoretest, CreateAmericanoLittle)
+TEST(CoffeeCoretest, CreateAmericanoLittle)
 {
     CoffeeCoreMock mock;
     CoffeeMachine machine(mock);
 
-    EXPECT_CALL(mock, AddWater(CupSizeLittle / 2, 60)).Times(1);
-    EXPECT_CALL(mock, AddCoffee(CupSizeLittle / 2)).Times(1);
+    EXPECT_CALL(mock, AddWater(CupSizeLittle / 3, 60)).Times(1);
+    EXPECT_CALL(mock, AddCoffee((2*CupSizeLittle) / 3)).Times(1);
     machine.CreateLittleCup();
     machine.CreateAmericano();
 }
 
-TEST(CoffeCoretest, CreateAmericanoLittle_NoCup)
+TEST(CoffeeCoretest, CreateAmericanoLittle_NoCup)
 {
     CoffeeCoreMock mock;
     CoffeeMachine machine(mock);
@@ -156,4 +190,74 @@ TEST(CoffeCoretest, CreateAmericanoLittle_NoCup)
     EXPECT_THROW(machine.CreateAmericano(), std::runtime_error);
 }
 
-// add other tests
+TEST(CoffeeCoretest, CreateCappuccinoBig)
+{
+    CoffeeCoreMock mock;
+    CoffeeMachine machine(mock);
+
+    EXPECT_CALL(mock, AddMilk(CupSizeBig / 3, 80)).Times(1);
+    EXPECT_CALL(mock, AddCoffee(CupSizeBig / 3)).Times(1);
+    EXPECT_CALL(mock, AddMilkFoam(CupSizeBig / 3)).Times(1);
+    machine.CreateBigCup();
+    machine.CreateCappuccino();
+}
+
+TEST(CoffeeCoretest, CreateCappuccinoLittle)
+{
+    CoffeeCoreMock mock;
+    CoffeeMachine machine(mock);
+
+    EXPECT_CALL(mock, AddMilk(CupSizeLittle / 3, 80)).Times(1);
+    EXPECT_CALL(mock, AddCoffee(CupSizeLittle / 3)).Times(1);
+    EXPECT_CALL(mock, AddMilkFoam(CupSizeLittle / 3)).Times(1);
+    machine.CreateLittleCup();
+    machine.CreateCappuccino();
+}
+
+TEST(CoffeeCoretest, CreateLatteBig)
+{
+    CoffeeCoreMock mock;
+    CoffeeMachine machine(mock);
+
+    EXPECT_CALL(mock, AddMilk(CupSizeBig / 4, 90)).Times(1);
+    EXPECT_CALL(mock, AddCoffee(CupSizeBig / 2)).Times(1);
+    EXPECT_CALL(mock, AddMilkFoam(CupSizeBig / 4)).Times(1);
+    machine.CreateBigCup();
+    machine.CreateLatte();
+}
+
+TEST(CoffeeCoretest, CreateLatteLittle)
+{
+    CoffeeCoreMock mock;
+    CoffeeMachine machine(mock);
+
+    EXPECT_CALL(mock, AddMilk(CupSizeLittle / 4, 90)).Times(1);
+    EXPECT_CALL(mock, AddCoffee(CupSizeLittle / 2)).Times(1);
+    EXPECT_CALL(mock, AddMilkFoam(CupSizeLittle / 4)).Times(1);
+    machine.CreateLittleCup();
+    machine.CreateLatte();
+}
+
+TEST(CoffeeCoretest, CreateMarochinoBig)
+{
+    CoffeeCoreMock mock;
+    CoffeeMachine machine(mock);
+
+    EXPECT_CALL(mock, AddChocolate(CupSizeBig / 4)).Times(1);
+    EXPECT_CALL(mock, AddCoffee(CupSizeBig / 4)).Times(1);
+    EXPECT_CALL(mock, AddMilkFoam(CupSizeBig / 4)).Times(1);
+    machine.CreateBigCup();
+    machine.CreateMarochino();
+}
+
+TEST(CoffeeCoretest, CreateMarochinoLittle)
+{
+    CoffeeCoreMock mock;
+    CoffeeMachine machine(mock);
+
+    EXPECT_CALL(mock, AddChocolate(CupSizeLittle / 4)).Times(1);
+    EXPECT_CALL(mock, AddCoffee(CupSizeLittle / 4)).Times(1);
+    EXPECT_CALL(mock, AddMilkFoam(CupSizeLittle / 4)).Times(1);
+    machine.CreateLittleCup();
+    machine.CreateMarochino();
+}
diff --git a/tdd_intro/workshops/workshops.pro b/tdd_intro/workshops/workshops.pro
index 3bcc2e2..39112a7 100644
--- a/tdd_intro/workshops/workshops.pro
+++ b/tdd_intro/workshops/workshops.pro
@@ -5,4 +5,5 @@ SUBDIRS += \
     02_word_count \
     03_anagram \
     04_trinary_numbers \
-    05_word_wrapp
+    05_word_wrapp \
+    07_coffee