diff --git a/src/Chapter01.Tests/Chapter01.Tests.csproj b/src/Chapter01.Tests/Chapter01.Tests.csproj
index 27ad70433..81b78a2e0 100644
--- a/src/Chapter01.Tests/Chapter01.Tests.csproj
+++ b/src/Chapter01.Tests/Chapter01.Tests.csproj
@@ -5,13 +5,13 @@
Chapter01.Tests
+
-
diff --git a/src/Chapter02.Tests/Chapter02.Tests.csproj b/src/Chapter02.Tests/Chapter02.Tests.csproj
index 0c03dbcdb..6a023f117 100644
--- a/src/Chapter02.Tests/Chapter02.Tests.csproj
+++ b/src/Chapter02.Tests/Chapter02.Tests.csproj
@@ -5,13 +5,13 @@
Chapter02.Tests
+
-
diff --git a/src/Chapter03.Tests/Chapter03.Tests.csproj b/src/Chapter03.Tests/Chapter03.Tests.csproj
index 26fee8f04..c58fc72db 100644
--- a/src/Chapter03.Tests/Chapter03.Tests.csproj
+++ b/src/Chapter03.Tests/Chapter03.Tests.csproj
@@ -5,13 +5,13 @@
Chapter03.Tests
+
-
diff --git a/src/Chapter04.Tests/Chapter04.Tests.csproj b/src/Chapter04.Tests/Chapter04.Tests.csproj
index 83e17c9f3..e888458c5 100644
--- a/src/Chapter04.Tests/Chapter04.Tests.csproj
+++ b/src/Chapter04.Tests/Chapter04.Tests.csproj
@@ -1,17 +1,17 @@
-
+
Exe
netcoreapp2.0
Chapter04.Tests
+
-
diff --git a/src/Chapter05.Tests/Chapter05.Tests.csproj b/src/Chapter05.Tests/Chapter05.Tests.csproj
index ae4944c32..9daca36ee 100644
--- a/src/Chapter05.Tests/Chapter05.Tests.csproj
+++ b/src/Chapter05.Tests/Chapter05.Tests.csproj
@@ -1,17 +1,17 @@
-
+
Exe
netcoreapp2.0
Chapter05.Tests
+
-
diff --git a/src/Chapter06.Tests/Chapter06.Tests.csproj b/src/Chapter06.Tests/Chapter06.Tests.csproj
index bc7c73036..37dec632d 100644
--- a/src/Chapter06.Tests/Chapter06.Tests.csproj
+++ b/src/Chapter06.Tests/Chapter06.Tests.csproj
@@ -5,13 +5,13 @@
Chapter08.Tests
+
-
diff --git a/src/Chapter07.Tests/Chapter07.Tests.csproj b/src/Chapter07.Tests/Chapter07.Tests.csproj
index 701e9e1d5..81749dded 100644
--- a/src/Chapter07.Tests/Chapter07.Tests.csproj
+++ b/src/Chapter07.Tests/Chapter07.Tests.csproj
@@ -1,18 +1,17 @@
-
-
+
Exe
netcoreapp2.0
Chapter07.Tests
+
-
diff --git a/src/Chapter08.Tests/Chapter08.Tests.csproj b/src/Chapter08.Tests/Chapter08.Tests.csproj
index e70948c77..bd9e5e2ed 100644
--- a/src/Chapter08.Tests/Chapter08.Tests.csproj
+++ b/src/Chapter08.Tests/Chapter08.Tests.csproj
@@ -5,13 +5,13 @@
Chapter08.Tests
+
-
diff --git a/src/Chapter09.Tests/Chapter09.Tests.csproj b/src/Chapter09.Tests/Chapter09.Tests.csproj
index 8e78adf22..d99fc43c3 100644
--- a/src/Chapter09.Tests/Chapter09.Tests.csproj
+++ b/src/Chapter09.Tests/Chapter09.Tests.csproj
@@ -5,13 +5,13 @@
Chapter09.Tests
+
-
\ No newline at end of file
diff --git a/src/Chapter10.Tests/Chapter10.Tests.csproj b/src/Chapter10.Tests/Chapter10.Tests.csproj
index 91c7265b3..acbc60065 100644
--- a/src/Chapter10.Tests/Chapter10.Tests.csproj
+++ b/src/Chapter10.Tests/Chapter10.Tests.csproj
@@ -5,6 +5,7 @@
Chapter10.Tests
+
@@ -12,7 +13,6 @@
-
diff --git a/src/Chapter12.Tests/Chapter12.Tests.csproj b/src/Chapter12.Tests/Chapter12.Tests.csproj
index 95db85a66..1c9d2ca64 100644
--- a/src/Chapter12.Tests/Chapter12.Tests.csproj
+++ b/src/Chapter12.Tests/Chapter12.Tests.csproj
@@ -5,13 +5,13 @@
Chapter12.Tests
+
-
diff --git a/src/Chapter13.Tests/Chapter13.Tests.csproj b/src/Chapter13.Tests/Chapter13.Tests.csproj
index bd31f36dd..2a4309f1b 100644
--- a/src/Chapter13.Tests/Chapter13.Tests.csproj
+++ b/src/Chapter13.Tests/Chapter13.Tests.csproj
@@ -5,13 +5,13 @@
Chapter13.Tests
+
-
diff --git a/src/Chapter14.Tests/Chapter14.Tests.csproj b/src/Chapter14.Tests/Chapter14.Tests.csproj
index 235795936..d79faaad4 100644
--- a/src/Chapter14.Tests/Chapter14.Tests.csproj
+++ b/src/Chapter14.Tests/Chapter14.Tests.csproj
@@ -5,6 +5,7 @@
Chapter14.Tests
+
@@ -12,7 +13,6 @@
-
diff --git a/src/Chapter15.Tests/Chapter15.Tests.csproj b/src/Chapter15.Tests/Chapter15.Tests.csproj
index 13a3473a4..a9a7d4853 100644
--- a/src/Chapter15.Tests/Chapter15.Tests.csproj
+++ b/src/Chapter15.Tests/Chapter15.Tests.csproj
@@ -5,13 +5,13 @@
Chapter15.Tests
+
-
diff --git a/src/Chapter16.Tests/Chapter16.Tests.csproj b/src/Chapter16.Tests/Chapter16.Tests.csproj
index 36a78adcf..a53152f40 100644
--- a/src/Chapter16.Tests/Chapter16.Tests.csproj
+++ b/src/Chapter16.Tests/Chapter16.Tests.csproj
@@ -5,13 +5,13 @@
Chapter16.Tests
+
-
diff --git a/src/Chapter17.Tests/Chapter17.Tests.csproj b/src/Chapter17.Tests/Chapter17.Tests.csproj
index 2c10b3084..c447ec7da 100644
--- a/src/Chapter17.Tests/Chapter17.Tests.csproj
+++ b/src/Chapter17.Tests/Chapter17.Tests.csproj
@@ -5,13 +5,13 @@
Chapter17.Tests
+
-
diff --git a/src/Chapter18.Tests/Chapter18.Tests.csproj b/src/Chapter18.Tests/Chapter18.Tests.csproj
index fb6e5d65a..434d03f91 100644
--- a/src/Chapter18.Tests/Chapter18.Tests.csproj
+++ b/src/Chapter18.Tests/Chapter18.Tests.csproj
@@ -5,13 +5,13 @@
Chapter18.Tests
+
-
diff --git a/src/Chapter19.Tests/Chapter19.Tests.csproj b/src/Chapter19.Tests/Chapter19.Tests.csproj
index 5e32adc6c..46c23f4fc 100644
--- a/src/Chapter19.Tests/Chapter19.Tests.csproj
+++ b/src/Chapter19.Tests/Chapter19.Tests.csproj
@@ -1,22 +1,18 @@
-
netcoreapp2.0
-
+
+
-
-
-
-
diff --git a/src/Chapter20.Tests/Chapter20.Tests.csproj b/src/Chapter20.Tests/Chapter20.Tests.csproj
index 9f758847e..9e3aa687f 100644
--- a/src/Chapter20.Tests/Chapter20.Tests.csproj
+++ b/src/Chapter20.Tests/Chapter20.Tests.csproj
@@ -1,22 +1,18 @@
-
netcoreapp2.0
-
+
+
-
-
-
-
diff --git a/src/Chapter21.Tests/Chapter21.Tests.csproj b/src/Chapter21.Tests/Chapter21.Tests.csproj
index e8eeecbe3..bd6837622 100644
--- a/src/Chapter21.Tests/Chapter21.Tests.csproj
+++ b/src/Chapter21.Tests/Chapter21.Tests.csproj
@@ -1,22 +1,18 @@
-
netcoreapp2.0
-
+
+
-
-
-
-
diff --git a/src/ChapterTests.targets b/src/ChapterTests.targets
new file mode 100644
index 000000000..e21a61065
--- /dev/null
+++ b/src/ChapterTests.targets
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file