diff --git a/.gitignore b/.gitignore
index 259148fa..32673502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@
 *.exe
 *.out
 *.app
+build
+.DS_Store
+*.pro.user
diff --git a/tdd_intro/3rd_party/gmock/include/gmock/internal/gmock-internal-utils.h b/tdd_intro/3rd_party/gmock/include/gmock/internal/gmock-internal-utils.h
index e12b7d7d..5507611a 100644
--- a/tdd_intro/3rd_party/gmock/include/gmock/internal/gmock-internal-utils.h
+++ b/tdd_intro/3rd_party/gmock/include/gmock/internal/gmock-internal-utils.h
@@ -46,6 +46,13 @@
 #include "gmock/internal/gmock-port.h"
 #include "gtest/gtest.h"
 
+namespace {
+
+const testing::internal::RelationToSourceCopy kCopy;
+const testing::internal::RelationToSourceReference kReference;
+
+}
+
 namespace testing {
 namespace internal {
 
diff --git a/tdd_intro/cleanroom/cleanroom.pro b/tdd_intro/cleanroom/cleanroom.pro
index b92a4278..31ff6a0b 100644
--- a/tdd_intro/cleanroom/cleanroom.pro
+++ b/tdd_intro/cleanroom/cleanroom.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 
-SUBDIRS += \
-    chatclient
+#SUBDIRS += \
+#    chatclient
diff --git a/tdd_intro/gtest.pri b/tdd_intro/gtest.pri
index 586007bb..bc93ca62 100644
--- a/tdd_intro/gtest.pri
+++ b/tdd_intro/gtest.pri
@@ -1,6 +1,6 @@
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../3rd_party/gtest/release/ -lgtest
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../3rd_party/gtest/debug/ -lgtest
-else:unix:!macx: LIBS += -L$$OUT_PWD/../../3rd_party/gtest/ -lgtest
+else:unix: LIBS += -L$$OUT_PWD/../../3rd_party/gtest/ -lgtest
 
 INCLUDEPATH += $$PWD/3rd_party/gtest/googletest/include
 DEPENDPATH += $$PWD/3rd_party/gtest/googletest/include
@@ -10,4 +10,4 @@ win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../3rd_
 else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../3rd_party/gtest/debug/libgtest.a
 else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../3rd_party/gtest/release/gtest.lib
 else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../3rd_party/gtest/debug/gtest.lib
-else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../../3rd_party/gtest/libgtest.a
+else:unix: PRE_TARGETDEPS += $$OUT_PWD/../../3rd_party/gtest/libgtest.a
diff --git a/tdd_intro/homework/01_leap_year/test.cpp b/tdd_intro/homework/01_leap_year/test.cpp
index 4f186c8b..d21da96d 100644
--- a/tdd_intro/homework/01_leap_year/test.cpp
+++ b/tdd_intro/homework/01_leap_year/test.cpp
@@ -13,3 +13,48 @@ If your language provides a method in the standard library that does this look-u
 */
 
 #include <gtest/gtest.h>
+
+bool is_multiple(int number, int base)
+{
+    return number % base == 0;
+}
+
+bool is_leap_year(int year)
+{
+    if (is_multiple(year, 400))
+    {
+        return true;
+    }
+
+    if (is_multiple(year, 100))
+    {
+        return false;
+    }
+
+    if (is_multiple(year, 4))
+    {
+        return true;
+    }
+
+    return false;
+}
+
+TEST(is_leap_year, returns_true_for_4)
+{
+    EXPECT_TRUE(is_leap_year(4));
+}
+
+TEST(is_leap_year, returns_false_for_5)
+{
+    EXPECT_FALSE(is_leap_year(5));
+}
+
+TEST(is_leap_year, returns_false_for_100)
+{
+    EXPECT_FALSE(is_leap_year(100));
+}
+
+TEST(is_leap_year, returns_true_for_400)
+{
+    EXPECT_TRUE(is_leap_year(400));
+}
diff --git a/tdd_intro/homework/04_weather_client/04_weather_client.pro b/tdd_intro/homework/04_weather_client/04_weather_client.pro
index dec9b6a8..e8f86261 100644
--- a/tdd_intro/homework/04_weather_client/04_weather_client.pro
+++ b/tdd_intro/homework/04_weather_client/04_weather_client.pro
@@ -1,4 +1,5 @@
 include(../../gmock.pri)
+include(../../gtest.pri)
 
 TEMPLATE = app
 CONFIG += console c++11
diff --git a/tdd_intro/homework/04_weather_client/test.cpp b/tdd_intro/homework/04_weather_client/test.cpp
index 346ea809..476405e2 100644
--- a/tdd_intro/homework/04_weather_client/test.cpp
+++ b/tdd_intro/homework/04_weather_client/test.cpp
@@ -47,6 +47,8 @@ Each line means "<request>" : "<response>":
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+#include <cmath>
+
 struct Weather
 {
     short temperature = 0;
diff --git a/tdd_intro/homework/05_coffee/05_coffee.pro b/tdd_intro/homework/05_coffee/05_coffee.pro
index dec9b6a8..05f06c68 100644
--- a/tdd_intro/homework/05_coffee/05_coffee.pro
+++ b/tdd_intro/homework/05_coffee/05_coffee.pro
@@ -1,3 +1,4 @@
+include(../../gtest.pri)
 include(../../gmock.pri)
 
 TEMPLATE = app