small ci changes

47 files changed, 80 insertions, 291 deletions

diff --git a/.travis.yml b/.travis.yml
index ddfabc0..4586845 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,7 @@ before_install:
   - if [ "$PUBLISH_DOCS" == "On" ]; then sudo apt-get install doxygen; fi
   - sh projects/scripts/travis-install.sh
   - if [ -n "$CLANG_VERSION" ]; then sh projects/scripts/install_libcxx.sh; fi
-  - wget http://apt.biicode.com/install.sh && chmod +x install.sh && ./install.sh
+  - if [ "$PUBLISH_DOCS" == "On" ]; then wget http://apt.biicode.com/install.sh && chmod +x install.sh && ./install.sh; fi
 install:
   - export CXX_FLAGS=""
   - export CXX_LINKER_FLAGS=""
@@ -72,9 +72,9 @@ script:
 after_success:
   - if [ "$PUBLISH_DOCS" == "On" ]; then sh projects/scripts/travis-doxygen.sh; fi
   - if [ "$PUBLISH_DOCS" == "On" ]; then cd projects/biicode; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then cp ../../AUTHORS.txt AUTHORS.txt; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then cp ../../Rx/v2/src/license.txt license.txt; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then cp -r ../../Rx/v2/src/rxcpp ./rxcpp; fi
+  - if [ "$PUBLISH_DOCS" == "On" ]; then cp ../../AUTHORS.txt ./blocks/kirkshoop/rxcpp/AUTHORS.txt; fi
+  - if [ "$PUBLISH_DOCS" == "On" ]; then cp ../../Rx/v2/src/license.txt ./blocks/kirkshoop/rxcpp/license.txt; fi
+  - if [ "$PUBLISH_DOCS" == "On" ]; then cp -r ../../Rx/v2/src/rxcpp/* ./blocks/kirkshoop/rxcpp/*; fi
   - if [ "$PUBLISH_DOCS" == "On" ]; then bii setup:cpp; fi
   - if [ "$PUBLISH_DOCS" == "On" ]; then bii init; fi
 branches:
diff --git a/Rx/v2/test/CMakeLists.txt b/Rx/v2/test/CMakeLists.txt
index 79eb463..e1a17b3 100644
--- a/Rx/v2/test/CMakeLists.txt
+++ b/Rx/v2/test/CMakeLists.txt
@@ -61,8 +61,13 @@ set(TEST_SOURCES
 )
 
 
-add_executable(rxcppv2_test EXCLUDE_FROM_ALL ${TEST_DIR}/test.cpp ${TEST_SOURCES})
+add_executable(rxcppv2_test ${TEST_DIR}/test.cpp ${TEST_SOURCES})
 add_executable(rxcpp::tests ALIAS rxcppv2_test)
+set_target_properties(
+    rxcppv2_test PROPERTIES
+    EXCLUDE_FROM_DEFAULT_BUILD TRUE
+    EXCLUDE_FROM_ALL TRUE
+)
 target_compile_options(rxcppv2_test PUBLIC ${RX_COMPILE_OPTIONS})
 target_compile_features(rxcppv2_test PUBLIC ${RX_COMPILE_FEATURES})
 target_include_directories(rxcppv2_test
diff --git a/Rx/v2/test/operators/amb.cpp b/Rx/v2/test/operators/amb.cpp
index 79e1f7f..60bbf83 100644
--- a/Rx/v2/test/operators/amb.cpp
+++ b/Rx/v2/test/operators/amb.cpp
@@ -1,12 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxsc=rxcpp::schedulers;
-namespace rxn=rx::notifications;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("amb never 3", "[amb][join][operators]"){
     GIVEN("1 cold observable with 3 hot observables of ints."){
diff --git a/Rx/v2/test/operators/amb_variadic.cpp b/Rx/v2/test/operators/amb_variadic.cpp
index 038cc5a..14f898b 100644
--- a/Rx/v2/test/operators/amb_variadic.cpp
+++ b/Rx/v2/test/operators/amb_variadic.cpp
@@ -1,12 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxsc=rxcpp::schedulers;
-namespace rxn=rx::notifications;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("variadic amb never 3", "[amb][join][operators]"){
     GIVEN("3 hot observables of ints."){
diff --git a/Rx/v2/test/operators/buffer.cpp b/Rx/v2/test/operators/buffer.cpp
index 118709e..bd3b302 100644
--- a/Rx/v2/test/operators/buffer.cpp
+++ b/Rx/v2/test/operators/buffer.cpp
@@ -1,11 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("buffer count partial window", "[buffer][operators]"){
     GIVEN("1 hot observable of ints."){
diff --git a/Rx/v2/test/operators/combine_latest.cpp b/Rx/v2/test/operators/combine_latest.cpp
index 51e6819..365683d 100644
--- a/Rx/v2/test/operators/combine_latest.cpp
+++ b/Rx/v2/test/operators/combine_latest.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("combine_latest interleaved with tail", "[combine_latest][join][operators]"){
     GIVEN("2 hot observables of ints."){
diff --git a/Rx/v2/test/operators/concat.cpp b/Rx/v2/test/operators/concat.cpp
index f37ec24..459eb68 100644
--- a/Rx/v2/test/operators/concat.cpp
+++ b/Rx/v2/test/operators/concat.cpp
@@ -1,11 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 const int static_onnextcalls = 1000000;
 
diff --git a/Rx/v2/test/operators/concat_map.cpp b/Rx/v2/test/operators/concat_map.cpp
index b82749a..a571257 100644
--- a/Rx/v2/test/operators/concat_map.cpp
+++ b/Rx/v2/test/operators/concat_map.cpp
@@ -1,12 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxo=rxcpp::operators;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 static const int static_tripletCount = 100;
 
diff --git a/Rx/v2/test/operators/distinct_until_changed.cpp b/Rx/v2/test/operators/distinct_until_changed.cpp
index cf8d5cf..9059bda 100644
--- a/Rx/v2/test/operators/distinct_until_changed.cpp
+++ b/Rx/v2/test/operators/distinct_until_changed.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu = rxcpp::util;
-namespace rxsc = rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("distinct_until_changed - never", "[distinct_until_changed][operators]"){
     GIVEN("a source"){
diff --git a/Rx/v2/test/operators/filter.cpp b/Rx/v2/test/operators/filter.cpp
index accb527..54dd71c 100644
--- a/Rx/v2/test/operators/filter.cpp
+++ b/Rx/v2/test/operators/filter.cpp
@@ -1,13 +1,5 @@
-#define RXCPP_USE_OBSERVABLE_MEMBERS 1
+#include "../test.h"
 
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxo=rxcpp::operators;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
 
 namespace {
 bool IsPrime(int x)
diff --git a/Rx/v2/test/operators/flat_map.cpp b/Rx/v2/test/operators/flat_map.cpp
index 5a68023..23874f5 100644
--- a/Rx/v2/test/operators/flat_map.cpp
+++ b/Rx/v2/test/operators/flat_map.cpp
@@ -1,12 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxo=rxcpp::operators;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 static const int static_tripletCount = 100;
 
diff --git a/Rx/v2/test/operators/group_by.cpp b/Rx/v2/test/operators/group_by.cpp
index 6677f9e..d3e09ed 100644
--- a/Rx/v2/test/operators/group_by.cpp
+++ b/Rx/v2/test/operators/group_by.cpp
@@ -1,10 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 #include <locale>
 
diff --git a/Rx/v2/test/operators/lift.cpp b/Rx/v2/test/operators/lift.cpp
index 0794178..7d90bce 100644
--- a/Rx/v2/test/operators/lift.cpp
+++ b/Rx/v2/test/operators/lift.cpp
@@ -1,13 +1,4 @@
-#define RXCPP_USE_OBSERVABLE_MEMBERS 1
-
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxo=rxcpp::operators;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 namespace detail {
 
diff --git a/Rx/v2/test/operators/map.cpp b/Rx/v2/test/operators/map.cpp
index aab227f..d672d7e 100644
--- a/Rx/v2/test/operators/map.cpp
+++ b/Rx/v2/test/operators/map.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("map stops on completion", "[map][operators]"){
     GIVEN("a test hot observable of ints"){
diff --git a/Rx/v2/test/operators/merge.cpp b/Rx/v2/test/operators/merge.cpp
index 2b32838..389e823 100644
--- a/Rx/v2/test/operators/merge.cpp
+++ b/Rx/v2/test/operators/merge.cpp
@@ -1,11 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 const int static_onnextcalls = 1000000;
 
diff --git a/Rx/v2/test/operators/observe_on.cpp b/Rx/v2/test/operators/observe_on.cpp
index ce409bf..b3190c1 100644
--- a/Rx/v2/test/operators/observe_on.cpp
+++ b/Rx/v2/test/operators/observe_on.cpp
@@ -1,12 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxsc=rxcpp::schedulers;
-namespace rxsub=rxcpp::subjects;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 const int static_onnextcalls = 100000;
 
diff --git a/Rx/v2/test/operators/on_error_resume_next.cpp b/Rx/v2/test/operators/on_error_resume_next.cpp
index aec1774..c6c8fc8 100644
--- a/Rx/v2/test/operators/on_error_resume_next.cpp
+++ b/Rx/v2/test/operators/on_error_resume_next.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("on_error_resume_next stops on completion", "[on_error_resume_next][operators]"){
     GIVEN("a test hot observable of ints"){
@@ -149,4 +144,4 @@ SCENARIO("on_error_resume_next stops on error", "[on_error_resume_next][operator
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Rx/v2/test/operators/pairwise.cpp b/Rx/v2/test/operators/pairwise.cpp
index cb0a888..20da0d8 100644
--- a/Rx/v2/test/operators/pairwise.cpp
+++ b/Rx/v2/test/operators/pairwise.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("pairwise", "[pairwise][operators]") {
     GIVEN("a cold observable of n ints") {
diff --git a/Rx/v2/test/operators/publish.cpp b/Rx/v2/test/operators/publish.cpp
index 0a22309..62d81ff 100644
--- a/Rx/v2/test/operators/publish.cpp
+++ b/Rx/v2/test/operators/publish.cpp
@@ -1,12 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
-
+#include "../test.h"
 
 SCENARIO("publish range", "[hide][range][subject][publish][subject][operators]"){
     GIVEN("a range"){
diff --git a/Rx/v2/test/operators/reduce.cpp b/Rx/v2/test/operators/reduce.cpp
index 8a552e3..e0f8e5e 100644
--- a/Rx/v2/test/operators/reduce.cpp
+++ b/Rx/v2/test/operators/reduce.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("reduce some data with seed", "[reduce][operators]"){
     GIVEN("a test hot observable of ints"){
diff --git a/Rx/v2/test/operators/repeat.cpp b/Rx/v2/test/operators/repeat.cpp
index cf91a37..d34f1b3 100644
--- a/Rx/v2/test/operators/repeat.cpp
+++ b/Rx/v2/test/operators/repeat.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("repeat, basic test", "[repeat][operators]"){
     GIVEN("cold observable of 3 ints."){
diff --git a/Rx/v2/test/operators/replay.cpp b/Rx/v2/test/operators/replay.cpp
index 13d32b5..a694854 100644
--- a/Rx/v2/test/operators/replay.cpp
+++ b/Rx/v2/test/operators/replay.cpp
@@ -1,11 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("replay basic", "[replay][multicast][subject][operators]"){
     GIVEN("a test hot observable of ints"){
diff --git a/Rx/v2/test/operators/retry.cpp b/Rx/v2/test/operators/retry.cpp
index f2d4df4..12a7fc3 100644
--- a/Rx/v2/test/operators/retry.cpp
+++ b/Rx/v2/test/operators/retry.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu = rxcpp::util;
-namespace rxsc = rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("retry, basic test", "[retry][operators]") {
     GIVEN("hot observable of 3x4x7 ints with errors inbetween the groups. Infinite retry.") {
diff --git a/Rx/v2/test/operators/scan.cpp b/Rx/v2/test/operators/scan.cpp
index 0645c87..b7a7276 100644
--- a/Rx/v2/test/operators/scan.cpp
+++ b/Rx/v2/test/operators/scan.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("scan: issue 41", "[scan][operators][issue][hide]"){
     GIVEN("map of scan of interval"){
diff --git a/Rx/v2/test/operators/skip.cpp b/Rx/v2/test/operators/skip.cpp
index 2596e74..32ac5de 100644
--- a/Rx/v2/test/operators/skip.cpp
+++ b/Rx/v2/test/operators/skip.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("skip, complete after", "[skip][operators]"){
     GIVEN("a source"){
diff --git a/Rx/v2/test/operators/skip_until.cpp b/Rx/v2/test/operators/skip_until.cpp
index 2b44673..697361b 100644
--- a/Rx/v2/test/operators/skip_until.cpp
+++ b/Rx/v2/test/operators/skip_until.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("skip_until, some data next", "[skip_until][skip][operators]"){
     GIVEN("2 sources"){
diff --git a/Rx/v2/test/operators/subscribe_on.cpp b/Rx/v2/test/operators/subscribe_on.cpp
index c8a25f7..a5428aa 100644
--- a/Rx/v2/test/operators/subscribe_on.cpp
+++ b/Rx/v2/test/operators/subscribe_on.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxs=rx::rxs;
-namespace rxsc=rx::rxsc;
-
-#include "catch.hpp"
+#include "../test.h"
 
 static const int static_subscriptions = 50000;
 
diff --git a/Rx/v2/test/operators/switch_on_next.cpp b/Rx/v2/test/operators/switch_on_next.cpp
index 32c4bac..d4c0f60 100644
--- a/Rx/v2/test/operators/switch_on_next.cpp
+++ b/Rx/v2/test/operators/switch_on_next.cpp
@@ -1,11 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-namespace rxn=rx::notifications;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("switch_on_next - some changes", "[switch_on_next][operators]"){
     GIVEN("a source"){
diff --git a/Rx/v2/test/operators/take.cpp b/Rx/v2/test/operators/take.cpp
index 846734b..4d5e9e1 100644
--- a/Rx/v2/test/operators/take.cpp
+++ b/Rx/v2/test/operators/take.cpp
@@ -1,10 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("take 2", "[take][operators]"){
     GIVEN("a source"){
diff --git a/Rx/v2/test/operators/take_until.cpp b/Rx/v2/test/operators/take_until.cpp
index 8afb0f6..e821f81 100644
--- a/Rx/v2/test/operators/take_until.cpp
+++ b/Rx/v2/test/operators/take_until.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("take_until trigger on_next", "[take_until][take][operators]"){
     GIVEN("2 sources"){
diff --git a/Rx/v2/test/operators/tap.cpp b/Rx/v2/test/operators/tap.cpp
index 94f09df..ca8b5f1 100644
--- a/Rx/v2/test/operators/tap.cpp
+++ b/Rx/v2/test/operators/tap.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("tap stops on completion", "[tap][operators]"){
     GIVEN("a test hot observable of ints"){
@@ -122,4 +117,4 @@ SCENARIO("tap stops on error", "[tap][operators]"){
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Rx/v2/test/operators/window.cpp b/Rx/v2/test/operators/window.cpp
index 35dc77d..b2049cc 100644
--- a/Rx/v2/test/operators/window.cpp
+++ b/Rx/v2/test/operators/window.cpp
@@ -1,13 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx = rxcpp;
-namespace rxu = rxcpp::util;
-namespace rxs = rxcpp::sources;
-namespace rxsc = rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-namespace rxt = rxcpp::test;
-
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("window count, basic", "[window][operators]"){
     GIVEN("1 hot observable of ints."){
diff --git a/Rx/v2/test/operators/zip.cpp b/Rx/v2/test/operators/zip.cpp
index 047edb2..3beebb4 100644
--- a/Rx/v2/test/operators/zip.cpp
+++ b/Rx/v2/test/operators/zip.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("zip never/never", "[zip][join][operators]"){
     GIVEN("2 hot observables of ints."){
diff --git a/Rx/v2/test/sources/create.cpp b/Rx/v2/test/sources/create.cpp
index c9a9a62..0e3cac7 100644
--- a/Rx/v2/test/sources/create.cpp
+++ b/Rx/v2/test/sources/create.cpp
@@ -1,10 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("create stops on completion", "[create][sources]"){
     GIVEN("a test cold observable of ints"){
diff --git a/Rx/v2/test/sources/defer.cpp b/Rx/v2/test/sources/defer.cpp
index 79f8c91..266380e 100644
--- a/Rx/v2/test/sources/defer.cpp
+++ b/Rx/v2/test/sources/defer.cpp
@@ -1,10 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("defer stops on completion", "[defer][sources]"){
     GIVEN("a test cold observable of ints"){
diff --git a/Rx/v2/test/sources/interval.cpp b/Rx/v2/test/sources/interval.cpp
index 6ea3aeb..38f4ac3 100644
--- a/Rx/v2/test/sources/interval.cpp
+++ b/Rx/v2/test/sources/interval.cpp
@@ -1,11 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
-
+#include "../test.h"
 
 SCENARIO("schedule_periodically", "[hide][periodically][scheduler][long][perf][sources]"){
     GIVEN("schedule_periodically"){
diff --git a/Rx/v2/test/sources/scope.cpp b/Rx/v2/test/sources/scope.cpp
index 476d434..383544b 100644
--- a/Rx/v2/test/sources/scope.cpp
+++ b/Rx/v2/test/sources/scope.cpp
@@ -1,10 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("scope, cold observable", "[scope][sources]"){
     GIVEN("a test cold observable of ints"){
diff --git a/Rx/v2/test/sources/timer.cpp b/Rx/v2/test/sources/timer.cpp
index 3fd1967..9141f2e 100644
--- a/Rx/v2/test/sources/timer.cpp
+++ b/Rx/v2/test/sources/timer.cpp
@@ -1,11 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxsc=rxcpp::schedulers;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
-
+#include "../test.h"
 
 SCENARIO("timer", "[hide][periodically][timer][scheduler][long][perf][sources]"){
     GIVEN("the timer of 1 sec"){
diff --git a/Rx/v2/test/subjects/subject.cpp b/Rx/v2/test/subjects/subject.cpp
index 921b7d0..f13a12a 100644
--- a/Rx/v2/test/subjects/subject.cpp
+++ b/Rx/v2/test/subjects/subject.cpp
@@ -1,14 +1,6 @@
 #define RXCPP_SUBJECT_TEST_ASYNC 1
 
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxu=rxcpp::util;
-namespace rxs=rxcpp::sources;
-namespace rxsc=rxcpp::schedulers;
-namespace rxsub=rxcpp::subjects;
-
-#include "rxcpp/rx-test.hpp"
-#include "catch.hpp"
+#include "../test.h"
 
 #include <future>
 
diff --git a/Rx/v2/test/subscriptions/observer.cpp b/Rx/v2/test/subscriptions/observer.cpp
index 259fe0b..57d4ad1 100644
--- a/Rx/v2/test/subscriptions/observer.cpp
+++ b/Rx/v2/test/subscriptions/observer.cpp
@@ -1,7 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("subscriber traits", "[observer][traits]"){
     GIVEN("given some subscriber types"){
diff --git a/Rx/v2/test/subscriptions/subscription.cpp b/Rx/v2/test/subscriptions/subscription.cpp
index a8f269d..365b6a0 100644
--- a/Rx/v2/test/subscriptions/subscription.cpp
+++ b/Rx/v2/test/subscriptions/subscription.cpp
@@ -1,9 +1,4 @@
-#include "rxcpp/rx.hpp"
-namespace rx=rxcpp;
-namespace rxs=rx::rxs;
-namespace rxsc=rx::rxsc;
-
-#include "catch.hpp"
+#include "../test.h"
 
 SCENARIO("observe subscription", "[hide]"){
     GIVEN("observable of ints"){
diff --git a/Rx/v2/test/test.h b/Rx/v2/test/test.h
new file mode 100644
index 0000000..1d33bfe
--- /dev/null
+++ b/Rx/v2/test/test.h
@@ -0,0 +1,22 @@
+#include <exception>
+#if (__GLIBCXX__ / 10000) == 2014 || (__GLIBCXX__ / 10000) == 2015
+namespace std {
+inline bool uncaught_exception() noexcept(true) {
+    return current_exception() != nullptr;
+}
+}
+#endif
+
+#include "rxcpp/rx.hpp"
+namespace rx=rxcpp;
+namespace rxu=rxcpp::util;
+namespace rxs=rxcpp::sources;
+namespace rxo=rxcpp::operators;
+namespace rxsub=rxcpp::subjects;
+namespace rxsc=rxcpp::schedulers;
+namespace rxn=rx::notifications;
+
+#include "rxcpp/rx-test.hpp"
+namespace rxt = rxcpp::test;
+
+#include "catch.hpp"
diff --git a/appveyor.yml b/appveyor.yml
index a6d45d8..5310d38 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,6 +11,12 @@ environment:
     - VSVER: Visual Studio 12 2013 Win64
 #    - VSVER: Visual Studio 14 2015 Win64
 
+platform:
+  - x64
+
+configuration:
+  - Release
+
 install:
     - choco install cmake
     - choco upgrade cmake
@@ -25,7 +31,7 @@ build:
 
 test_script:
   - cd build\test\
-  - ctest -V
+  - ctest -V -C Release
   - cd ..\..
 
 artifacts:
diff --git a/projects/biicode/blocks/kirkshoop/.DS_Store b/projects/biicode/blocks/kirkshoop/.DS_Store
new file mode 100644
index 0000000..80bc736
--- /dev/null
+++ b/projects/biicode/blocks/kirkshoop/.DS_Store
diff --git a/projects/biicode/CMakeLists.txt b/projects/biicode/blocks/kirkshoop/rxcpp/CMakeLists.txt
index 409230f..409230f 100644
--- a/projects/biicode/CMakeLists.txt
+++ b/projects/biicode/blocks/kirkshoop/rxcpp/CMakeLists.txt
diff --git a/projects/biicode/README.bii.md b/projects/biicode/blocks/kirkshoop/rxcpp/README.bii.md
index 092c98c..092c98c 100644
--- a/projects/biicode/README.bii.md
+++ b/projects/biicode/blocks/kirkshoop/rxcpp/README.bii.md
diff --git a/projects/biicode/biicode.conf b/projects/biicode/blocks/kirkshoop/rxcpp/biicode.conf
index b37ce83..b37ce83 100644
--- a/projects/biicode/biicode.conf
+++ b/projects/biicode/blocks/kirkshoop/rxcpp/biicode.conf