4 files changed, 11 insertions, 11 deletions
diff --git a/Rx/v2/test/sources/defer.cpp b/Rx/v2/test/sources/defer.cpp
index 266380e..a8187ad 100644
--- a/Rx/v2/test/sources/defer.cpp
+++ b/Rx/v2/test/sources/defer.cpp
@@ -15,7 +15,7 @@ SCENARIO("defer stops on completion", "[defer][sources]"){
             auto empty = rx::observable<>::empty<long>();
             auto just = rx::observable<>::just(42);
             auto one = rx::observable<>::from(42);
-            auto error = rx::observable<>::error<long>(std::exception_ptr());
+            auto error = rx::observable<>::error<long>(rxu::error_ptr());
             auto runtimeerror = rx::observable<>::error<long>(std::runtime_error("runtime"));
 
             auto res = w.start(
diff --git a/Rx/v2/test/sources/interval.cpp b/Rx/v2/test/sources/interval.cpp
index 38f4ac3..9ab2fca 100644
--- a/Rx/v2/test/sources/interval.cpp
+++ b/Rx/v2/test/sources/interval.cpp
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-SCENARIO("schedule_periodically", "[hide][periodically][scheduler][long][perf][sources]"){
+SCENARIO("schedule_periodically", "[!hide][periodically][scheduler][long][perf][sources]"){
     GIVEN("schedule_periodically"){
         WHEN("the period is 1sec and the initial is 2sec"){
             using namespace std::chrono;
@@ -21,7 +21,7 @@ SCENARIO("schedule_periodically", "[hide][periodically][scheduler][long][perf][s
     }
 }
 
-SCENARIO("schedule_periodically by duration", "[hide][periodically][scheduler][long][perf][sources]"){
+SCENARIO("schedule_periodically by duration", "[!hide][periodically][scheduler][long][perf][sources]"){
     GIVEN("schedule_periodically_duration"){
         WHEN("the period is 1sec and the initial is 2sec"){
             using namespace std::chrono;
@@ -64,7 +64,7 @@ SCENARIO("schedule_periodically by duration", "[hide][periodically][scheduler][l
     }
 }
 
-SCENARIO("intervals", "[hide][periodically][interval][scheduler][long][perf][sources]"){
+SCENARIO("intervals", "[!hide][periodically][interval][scheduler][long][perf][sources]"){
     GIVEN("10 intervals of 1 seconds"){
         WHEN("the period is 1sec and the initial is 2sec"){
             using namespace std::chrono;
@@ -84,7 +84,7 @@ SCENARIO("intervals", "[hide][periodically][interval][scheduler][long][perf][sou
                         std::cout << "interval          : period " << counter << ", " << nsDelta.count() << "ms delta from target time" << std::endl;
                         if (counter == 5) {cs.unsubscribe();}
                     },
-                    [](std::exception_ptr){abort();});
+                    [](rxu::error_ptr){abort();});
         }
     }
 }
diff --git a/Rx/v2/test/sources/scope.cpp b/Rx/v2/test/sources/scope.cpp
index 383544b..1389344 100644
--- a/Rx/v2/test/sources/scope.cpp
+++ b/Rx/v2/test/sources/scope.cpp
@@ -318,7 +318,7 @@ SCENARIO("scope, dispose", "[scope][sources]"){
     }
 }
 
-SCENARIO("scope, throw resource selector", "[scope][sources]"){
+SCENARIO("scope, throw resource selector", "[scope][sources][!throws]"){
     GIVEN("a test cold observable of ints"){
         auto sc = rxsc::make_test();
         auto w = sc.create_worker();
@@ -339,7 +339,7 @@ SCENARIO("scope, throw resource selector", "[scope][sources]"){
                         scope(
                             [&]() -> resource {
                                 ++resource_factory_invoked;
-                                throw ex;
+                                rxu::throw_exception(ex);
                                 //return resource(sc.clock());
                             },
                             [&](resource){
@@ -371,7 +371,7 @@ SCENARIO("scope, throw resource selector", "[scope][sources]"){
     }
 }
 
-SCENARIO("scope, throw resource usage", "[scope][sources]"){
+SCENARIO("scope, throw resource usage", "[scope][sources][!throws]"){
     GIVEN("a test cold observable of ints"){
         auto sc = rxsc::make_test();
         auto w = sc.create_worker();
@@ -396,7 +396,7 @@ SCENARIO("scope, throw resource usage", "[scope][sources]"){
                             },
                             [&](resource) -> rx::observable<int> {
                                 ++observable_factory_invoked;
-                                throw ex;
+                                rxu::throw_exception(ex);
                             }
                         )
                         // forget type to workaround lambda deduction bug on msvc 2013
diff --git a/Rx/v2/test/sources/timer.cpp b/Rx/v2/test/sources/timer.cpp
index 9141f2e..3f46b21 100644
--- a/Rx/v2/test/sources/timer.cpp
+++ b/Rx/v2/test/sources/timer.cpp
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-SCENARIO("timer", "[hide][periodically][timer][scheduler][long][perf][sources]"){
+SCENARIO("timer", "[!hide][periodically][timer][scheduler][long][perf][sources]"){
     GIVEN("the timer of 1 sec"){
         WHEN("the period is 1 sec"){
             using namespace std::chrono;
@@ -17,7 +17,7 @@ SCENARIO("timer", "[hide][periodically][timer][scheduler][long][perf][sources]")
                         auto nsDelta = duration_cast<milliseconds>(sc.now() - (start + (period * counter)));
                         std::cout << "timer          : period " << counter << ", " << nsDelta.count() << "ms delta from target time" << std::endl;
                     },
-                    [](std::exception_ptr){abort();},
+                    [](rxu::error_ptr){abort();},
                     [](){std::cout << "completed" << std::endl;});
         }
     }