diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..a2f755b2
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,31 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  xcode:
+    runs-on: macos-10.15
+    strategy:
+      matrix:
+        swift: [5.0, 4.2]
+      fail-fast: false
+    name: Action Tests (Swift ${{ matrix.swift }})
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer
+    steps:
+      - uses: actions/checkout@v2
+      - name: Cache Carthage
+        uses: actions/cache@v2
+        with:
+          path: Carthage
+          key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-carthage-
+      - name: Bootstrap Carthage
+        run: carthage bootstrap --no-use-binaries --cache-builds
+      - name: Tests
+        run: |
+          set -o pipefail && xcodebuild test SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action -destination "platform=iOS Simulator,name=iPhone 11" | xcpretty -c --test
+          set -o pipefail && xcodebuild test SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action-macOS -destination "arch=x86_64" | xcpretty -c --test
+      - name: Builds
+        run: |
+          set -o pipefail && xcodebuild build SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action-watchOS -destination "platform=watchOS Simulator,name=Apple Watch Series 5 - 44mm" | xcpretty -c
+          set -o pipefail && xcodebuild build SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action-tvOS -destination "platform=tvOS Simulator,name=Apple TV 4K (at 1080p)" | xcpretty -c
\ No newline at end of file
diff --git a/.swift-version b/.swift-version
deleted file mode 100644
index bf77d549..00000000
--- a/.swift-version
+++ /dev/null
@@ -1 +0,0 @@
-4.2
diff --git a/Action.podspec b/Action.podspec
index 7e21b46d..624a5cab 100644
--- a/Action.podspec
+++ b/Action.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Action"
-  s.version      = "3.11.0"
+  s.version      = "5.0.0"
   s.summary      = "Abstracts actions to be performed in RxSwift."
   s.description  = <<-DESC
     Encapsulates an action to be performed, usually by a button press, but also useful to pass actions to execute later
@@ -8,10 +8,10 @@ Pod::Spec.new do |s|
                    DESC
   s.homepage     = "https://github.com/RxSwiftCommunity/Action"
   s.license      = { :type => "MIT", :file => "License.md" }
-  s.author             = { "Ash Furrow" => "ash@ashfurrow.com" }
+  s.author             = { "RxSwift Community" => "community@rxswift.org" }
   s.social_media_url   = "http://twitter.com/ashfurrow"
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.osx.deployment_target = '10.10'
   s.watchos.deployment_target = '3.0'
   s.tvos.deployment_target = '9.0'
@@ -19,9 +19,11 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/RxSwiftCommunity/Action.git", :tag => s.version.to_s }
   s.source_files  = "Sources/**/*.{swift}"
 
+  s.swift_version   =   '5.0'
+
   s.frameworks  = "Foundation"
-  s.dependency "RxSwift", "~> 4.0"
-  s.dependency "RxCocoa", "~> 4.0"
+  s.dependency "RxSwift", '~> 6.0'
+  s.dependency "RxCocoa", '~> 6.0'
 
   s.watchos.exclude_files = "Control+Action.swift", "Button+Action.swift", "UIBarButtonItem+Action.swift", "UIAlertAction+Action.swift"
   s.osx.exclude_files = "UIBarButtonItem+Action.swift", "UIAlertAction+Action.swift"
diff --git a/Action.xcodeproj/project.pbxproj b/Action.xcodeproj/project.pbxproj
index b5d135eb..8332161f 100644
--- a/Action.xcodeproj/project.pbxproj
+++ b/Action.xcodeproj/project.pbxproj
@@ -23,8 +23,6 @@
 		3D730DEA1F674043008534D3 /* Button+Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D730DE81F673FD9008534D3 /* Button+Action.swift */; };
 		3D730DEB1F674044008534D3 /* Button+Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D730DE81F673FD9008534D3 /* Button+Action.swift */; };
 		3DD965C01F5DC0E400C180FE /* Action.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FCDDA821EAC3295006EB95B /* Action.framework */; };
-		3DD965C61F5DC2E100C180FE /* ActionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0569F01DE288EB007E1D0D /* ActionTests.swift */; };
-		3DD965C81F5DC2E700C180FE /* InputSubjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2861C91ED6A41700BB327A /* InputSubjectTests.swift */; };
 		3DD965DE1F5DF8C500C180FE /* BindToTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DD965DD1F5DF86B00C180FE /* BindToTests.swift */; };
 		3DD965DF1F5DF8C900C180FE /* NSButtonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DD965DA1F5DF79800C180FE /* NSButtonTests.swift */; };
 		5ED520241E1EA199007621B9 /* BindToTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ED520231E1EA199007621B9 /* BindToTests.swift */; };
@@ -36,7 +34,6 @@
 		7F0569EA1DE28587007E1D0D /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0569E21DE28587007E1D0D /* Action.swift */; };
 		7F0569EC1DE28587007E1D0D /* UIAlertAction+Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0569E51DE28587007E1D0D /* UIAlertAction+Action.swift */; };
 		7F0569ED1DE28587007E1D0D /* UIBarButtonItem+Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0569E61DE28587007E1D0D /* UIBarButtonItem+Action.swift */; };
-		7F0569F51DE288EB007E1D0D /* ActionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0569F01DE288EB007E1D0D /* ActionTests.swift */; };
 		7F0569F61DE288EB007E1D0D /* AlertActionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0569F11DE288EB007E1D0D /* AlertActionTests.swift */; };
 		7F0569F71DE288EB007E1D0D /* BarButtonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0569F21DE288EB007E1D0D /* BarButtonTests.swift */; };
 		7F0569F81DE288EB007E1D0D /* ButtonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0569F31DE288EB007E1D0D /* ButtonTests.swift */; };
@@ -48,37 +45,30 @@
 		7F612AD91D7F13B800B93BC5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7F612AD71D7F13B800B93BC5 /* LaunchScreen.storyboard */; };
 		7FB791EC1D7F1BB600789D53 /* Action.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE73AD201CDCD101006F8B98 /* Action.framework */; };
 		C41CE71F22283BBA0006E722 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71A22283BB90006E722 /* Nimble.framework */; };
-		C41CE72022283BBA0006E722 /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71B22283BB90006E722 /* RxBlocking.framework */; };
 		C41CE72122283BBA0006E722 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71C22283BB90006E722 /* Quick.framework */; };
-		C41CE72222283BBA0006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71D22283BBA0006E722 /* RxAtomic.framework */; };
-		C41CE72322283BBA0006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71E22283BBA0006E722 /* RxSwift.framework */; };
-		C41CE72C22283BEE0006E722 /* iOS in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72422283BEE0006E722 /* iOS */; };
-		C41CE72D22283BEE0006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72522283BEE0006E722 /* RxAtomic.framework */; };
 		C41CE72E22283BEE0006E722 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72622283BEE0006E722 /* Quick.framework */; };
-		C41CE72F22283BEE0006E722 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72722283BEE0006E722 /* RxCocoa.framework */; };
-		C41CE73022283BEE0006E722 /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72822283BEE0006E722 /* RxBlocking.framework */; };
 		C41CE73122283BEE0006E722 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72922283BEE0006E722 /* Nimble.framework */; };
-		C41CE73222283BEE0006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72A22283BEE0006E722 /* RxSwift.framework */; };
 		C41CE73322283BEE0006E722 /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72B22283BEE0006E722 /* RxTest.framework */; };
-		C41CE73622283CAD0006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71E22283BBA0006E722 /* RxSwift.framework */; };
-		C41CE73722283CAD0006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71D22283BBA0006E722 /* RxAtomic.framework */; };
-		C41CE73A22283CD00006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE73822283CD00006E722 /* RxAtomic.framework */; };
-		C41CE73B22283CD00006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE73922283CD00006E722 /* RxSwift.framework */; };
-		C41CE73C22283CF90006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72A22283BEE0006E722 /* RxSwift.framework */; };
-		C41CE73D22283CF90006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72522283BEE0006E722 /* RxAtomic.framework */; };
-		C41CE74022283D220006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE73E22283D220006E722 /* RxAtomic.framework */; };
-		C41CE74122283D220006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE73F22283D220006E722 /* RxSwift.framework */; };
 		C41E08EE2237D26D0039D213 /* Action+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DE00042229758700FB50AB /* Action+Extensions.swift */; };
 		C41E08EF2237D2700039D213 /* Action+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DE00042229758700FB50AB /* Action+Extensions.swift */; };
 		C41E08F02237D2740039D213 /* Action+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DE00042229758700FB50AB /* Action+Extensions.swift */; };
+		C4BFF33D2281D6E100D1AA27 /* Nimble+RxTest+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BFF33C2281D6E100D1AA27 /* Nimble+RxTest+Ext.swift */; };
+		C4BFF33E2281D6E100D1AA27 /* Nimble+RxTest+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BFF33C2281D6E100D1AA27 /* Nimble+RxTest+Ext.swift */; };
+		C4BFF3402282B79F00D1AA27 /* TestEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BFF33F2282B79F00D1AA27 /* TestEvents.swift */; };
+		C4BFF3412282B79F00D1AA27 /* TestEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BFF33F2282B79F00D1AA27 /* TestEvents.swift */; };
+		C4D3237E2285ADF7004B05A5 /* ActionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D3237D2285ADF7004B05A5 /* ActionTests.swift */; };
+		C4D3237F2285AEAD004B05A5 /* ActionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D3237D2285ADF7004B05A5 /* ActionTests.swift */; };
 		C4DE00052229758700FB50AB /* Action+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DE00042229758700FB50AB /* Action+Extensions.swift */; };
-		CA2861C81ED6979400BB327A /* InputSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2861C71ED6979400BB327A /* InputSubject.swift */; };
-		CA2861CA1ED6A41700BB327A /* InputSubjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2861C91ED6A41700BB327A /* InputSubjectTests.swift */; };
-		CA2861CB1ED6B08300BB327A /* InputSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2861C71ED6979400BB327A /* InputSubject.swift */; };
-		CA2861CC1ED6B08400BB327A /* InputSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2861C71ED6979400BB327A /* InputSubject.swift */; };
+		FA35FEE4249732450072FBEA /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA35FEE2249732450072FBEA /* RxSwift.framework */; };
+		FA35FEE6249732450072FBEA /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA35FEE3249732450072FBEA /* RxCocoa.framework */; };
+		FA35FEED249732900072FBEA /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA35FEEB249732900072FBEA /* RxCocoa.framework */; };
+		FA35FEEF249732900072FBEA /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA35FEEC249732900072FBEA /* RxSwift.framework */; };
+		FA35FEF4249732AA0072FBEA /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA35FEF2249732AA0072FBEA /* RxCocoa.framework */; };
+		FA35FEF6249732AA0072FBEA /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA35FEF3249732AA0072FBEA /* RxSwift.framework */; };
+		FA35FEFB249732B90072FBEA /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA35FEF9249732B90072FBEA /* RxSwift.framework */; };
+		FA35FEFD249732B90072FBEA /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA35FEFA249732B90072FBEA /* RxCocoa.framework */; };
 		FA3F973C1EDAF46F00A84787 /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0569E21DE28587007E1D0D /* Action.swift */; };
 		FA3F973D1EDAF46F00A84787 /* Action+Internal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0569E01DE28587007E1D0D /* Action+Internal.swift */; };
-		FA3F973E1EDAF46F00A84787 /* InputSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2861C71ED6979400BB327A /* InputSubject.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -128,7 +118,6 @@
 		7F0569E31DE28587007E1D0D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		7F0569E51DE28587007E1D0D /* UIAlertAction+Action.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIAlertAction+Action.swift"; sourceTree = "<group>"; };
 		7F0569E61DE28587007E1D0D /* UIBarButtonItem+Action.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIBarButtonItem+Action.swift"; sourceTree = "<group>"; };
-		7F0569F01DE288EB007E1D0D /* ActionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ActionTests.swift; path = ActionTests/ActionTests.swift; sourceTree = "<group>"; };
 		7F0569F11DE288EB007E1D0D /* AlertActionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertActionTests.swift; sourceTree = "<group>"; };
 		7F0569F21DE288EB007E1D0D /* BarButtonTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarButtonTests.swift; sourceTree = "<group>"; };
 		7F0569F31DE288EB007E1D0D /* ButtonTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonTests.swift; sourceTree = "<group>"; };
@@ -143,22 +132,13 @@
 		7F612ADA1D7F13B800B93BC5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		BE73AD201CDCD101006F8B98 /* Action.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Action.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C41CE71A22283BB90006E722 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/iOS/Nimble.framework; sourceTree = "<group>"; };
-		C41CE71B22283BB90006E722 /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/iOS/RxBlocking.framework; sourceTree = "<group>"; };
 		C41CE71C22283BB90006E722 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/iOS/Quick.framework; sourceTree = "<group>"; };
-		C41CE71D22283BBA0006E722 /* RxAtomic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxAtomic.framework; path = Carthage/Build/iOS/RxAtomic.framework; sourceTree = "<group>"; };
-		C41CE71E22283BBA0006E722 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
-		C41CE72422283BEE0006E722 /* iOS */ = {isa = PBXFileReference; lastKnownFileType = folder; name = iOS; path = Carthage/Build/iOS; sourceTree = "<group>"; };
-		C41CE72522283BEE0006E722 /* RxAtomic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxAtomic.framework; path = Carthage/Build/Mac/RxAtomic.framework; sourceTree = "<group>"; };
 		C41CE72622283BEE0006E722 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/Mac/Quick.framework; sourceTree = "<group>"; };
-		C41CE72722283BEE0006E722 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/Mac/RxCocoa.framework; sourceTree = "<group>"; };
-		C41CE72822283BEE0006E722 /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/Mac/RxBlocking.framework; sourceTree = "<group>"; };
 		C41CE72922283BEE0006E722 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/Mac/Nimble.framework; sourceTree = "<group>"; };
-		C41CE72A22283BEE0006E722 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/Mac/RxSwift.framework; sourceTree = "<group>"; };
 		C41CE72B22283BEE0006E722 /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/Mac/RxTest.framework; sourceTree = "<group>"; };
-		C41CE73822283CD00006E722 /* RxAtomic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxAtomic.framework; path = Carthage/Build/tvOS/RxAtomic.framework; sourceTree = "<group>"; };
-		C41CE73922283CD00006E722 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/tvOS/RxSwift.framework; sourceTree = "<group>"; };
-		C41CE73E22283D220006E722 /* RxAtomic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxAtomic.framework; path = Carthage/Build/watchOS/RxAtomic.framework; sourceTree = "<group>"; };
-		C41CE73F22283D220006E722 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/watchOS/RxSwift.framework; sourceTree = "<group>"; };
+		C4BFF33C2281D6E100D1AA27 /* Nimble+RxTest+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Nimble+RxTest+Ext.swift"; sourceTree = "<group>"; };
+		C4BFF33F2282B79F00D1AA27 /* TestEvents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestEvents.swift; sourceTree = "<group>"; };
+		C4D3237D2285ADF7004B05A5 /* ActionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionTests.swift; sourceTree = "<group>"; };
 		C4DE00042229758700FB50AB /* Action+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Action+Extensions.swift"; sourceTree = "<group>"; };
 		C4E0263F20D119EE00C8164C /* Action.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = Action.podspec; sourceTree = "<group>"; };
 		C4E0264020D11A0F00C8164C /* Cartfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
@@ -166,8 +146,14 @@
 		C4E0264220D11A3B00C8164C /* Readme.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Readme.md; sourceTree = "<group>"; };
 		C4E0264320D11CDD00C8164C /* circle.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = circle.yml; sourceTree = "<group>"; };
 		C4E0264420D1244900C8164C /* Changelog.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Changelog.md; sourceTree = "<group>"; };
-		CA2861C71ED6979400BB327A /* InputSubject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InputSubject.swift; sourceTree = "<group>"; };
-		CA2861C91ED6A41700BB327A /* InputSubjectTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InputSubjectTests.swift; sourceTree = "<group>"; };
+		FA35FEE2249732450072FBEA /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
+		FA35FEE3249732450072FBEA /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = "<group>"; };
+		FA35FEEB249732900072FBEA /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/tvOS/RxCocoa.framework; sourceTree = "<group>"; };
+		FA35FEEC249732900072FBEA /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/tvOS/RxSwift.framework; sourceTree = "<group>"; };
+		FA35FEF2249732AA0072FBEA /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/Mac/RxCocoa.framework; sourceTree = "<group>"; };
+		FA35FEF3249732AA0072FBEA /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/Mac/RxSwift.framework; sourceTree = "<group>"; };
+		FA35FEF9249732B90072FBEA /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/watchOS/RxSwift.framework; sourceTree = "<group>"; };
+		FA35FEFA249732B90072FBEA /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/watchOS/RxCocoa.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -175,8 +161,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C41CE73A22283CD00006E722 /* RxAtomic.framework in Frameworks */,
-				C41CE73B22283CD00006E722 /* RxSwift.framework in Frameworks */,
+				FA35FEEF249732900072FBEA /* RxSwift.framework in Frameworks */,
+				FA35FEED249732900072FBEA /* RxCocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -184,8 +170,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C41CE73C22283CF90006E722 /* RxSwift.framework in Frameworks */,
-				C41CE73D22283CF90006E722 /* RxAtomic.framework in Frameworks */,
+				FA35FEF6249732AA0072FBEA /* RxSwift.framework in Frameworks */,
+				FA35FEF4249732AA0072FBEA /* RxCocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -193,8 +179,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C41CE74022283D220006E722 /* RxAtomic.framework in Frameworks */,
-				C41CE74122283D220006E722 /* RxSwift.framework in Frameworks */,
+				FA35FEFD249732B90072FBEA /* RxCocoa.framework in Frameworks */,
+				FA35FEFB249732B90072FBEA /* RxSwift.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -202,13 +188,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C41CE72C22283BEE0006E722 /* iOS in Frameworks */,
-				C41CE72D22283BEE0006E722 /* RxAtomic.framework in Frameworks */,
 				C41CE72E22283BEE0006E722 /* Quick.framework in Frameworks */,
-				C41CE72F22283BEE0006E722 /* RxCocoa.framework in Frameworks */,
-				C41CE73022283BEE0006E722 /* RxBlocking.framework in Frameworks */,
 				C41CE73122283BEE0006E722 /* Nimble.framework in Frameworks */,
-				C41CE73222283BEE0006E722 /* RxSwift.framework in Frameworks */,
 				C41CE73322283BEE0006E722 /* RxTest.framework in Frameworks */,
 				3DD965C01F5DC0E400C180FE /* Action.framework in Frameworks */,
 			);
@@ -219,10 +200,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				C41CE71F22283BBA0006E722 /* Nimble.framework in Frameworks */,
-				C41CE72022283BBA0006E722 /* RxBlocking.framework in Frameworks */,
 				C41CE72122283BBA0006E722 /* Quick.framework in Frameworks */,
-				C41CE72222283BBA0006E722 /* RxAtomic.framework in Frameworks */,
-				C41CE72322283BBA0006E722 /* RxSwift.framework in Frameworks */,
 				7F612AA01D7F103A00B93BC5 /* Action.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -239,8 +217,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C41CE73622283CAD0006E722 /* RxSwift.framework in Frameworks */,
-				C41CE73722283CAD0006E722 /* RxAtomic.framework in Frameworks */,
+				FA35FEE6249732450072FBEA /* RxCocoa.framework in Frameworks */,
+				FA35FEE4249732450072FBEA /* RxSwift.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -291,7 +269,6 @@
 				7F0569E21DE28587007E1D0D /* Action.swift */,
 				C4DE00042229758700FB50AB /* Action+Extensions.swift */,
 				7F0569E01DE28587007E1D0D /* Action+Internal.swift */,
-				CA2861C71ED6979400BB327A /* InputSubject.swift */,
 				3D730DE11F673BCB008534D3 /* CommonUI */,
 				7F0569E41DE28587007E1D0D /* UIKitExtensions */,
 				7F0569EF1DE28598007E1D0D /* Supporting Files */,
@@ -321,23 +298,19 @@
 		7F5E6A5C1D7F06C4000B6076 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				C41CE73822283CD00006E722 /* RxAtomic.framework */,
-				C41CE73922283CD00006E722 /* RxSwift.framework */,
-				C41CE73E22283D220006E722 /* RxAtomic.framework */,
-				C41CE73F22283D220006E722 /* RxSwift.framework */,
-				C41CE72422283BEE0006E722 /* iOS */,
+				FA35FEEB249732900072FBEA /* RxCocoa.framework */,
+				FA35FEFA249732B90072FBEA /* RxCocoa.framework */,
+				FA35FEEC249732900072FBEA /* RxSwift.framework */,
+				FA35FEE3249732450072FBEA /* RxCocoa.framework */,
+				FA35FEE2249732450072FBEA /* RxSwift.framework */,
+				FA35FEF2249732AA0072FBEA /* RxCocoa.framework */,
+				FA35FEF3249732AA0072FBEA /* RxSwift.framework */,
+				FA35FEF9249732B90072FBEA /* RxSwift.framework */,
 				C41CE72922283BEE0006E722 /* Nimble.framework */,
 				C41CE72622283BEE0006E722 /* Quick.framework */,
-				C41CE72522283BEE0006E722 /* RxAtomic.framework */,
-				C41CE72822283BEE0006E722 /* RxBlocking.framework */,
-				C41CE72722283BEE0006E722 /* RxCocoa.framework */,
-				C41CE72A22283BEE0006E722 /* RxSwift.framework */,
 				C41CE72B22283BEE0006E722 /* RxTest.framework */,
 				C41CE71A22283BB90006E722 /* Nimble.framework */,
 				C41CE71C22283BB90006E722 /* Quick.framework */,
-				C41CE71D22283BBA0006E722 /* RxAtomic.framework */,
-				C41CE71B22283BB90006E722 /* RxBlocking.framework */,
-				C41CE71E22283BBA0006E722 /* RxSwift.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -347,8 +320,9 @@
 			children = (
 				3DD965DC1F5DF84800C180FE /* macOS-Tests */,
 				3DD965DB1F5DF83700C180FE /* iOS-Tests */,
-				7F0569F01DE288EB007E1D0D /* ActionTests.swift */,
-				CA2861C91ED6A41700BB327A /* InputSubjectTests.swift */,
+				C4D3237D2285ADF7004B05A5 /* ActionTests.swift */,
+				C4BFF33C2281D6E100D1AA27 /* Nimble+RxTest+Ext.swift */,
+				C4BFF33F2282B79F00D1AA27 /* TestEvents.swift */,
 				7F0569F41DE288EB007E1D0D /* Info.plist */,
 			);
 			path = Tests;
@@ -593,7 +567,7 @@
 					};
 					7F5E6A661D7F08D2000B6076 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					7F612ACB1D7F13B800B93BC5 = {
@@ -602,7 +576,7 @@
 					};
 					BE73AD1F1CDCD101006F8B98 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -719,7 +693,6 @@
 				C41E08EE2237D26D0039D213 /* Action+Extensions.swift in Sources */,
 				3D730DEA1F674043008534D3 /* Button+Action.swift in Sources */,
 				1FCDDA671EAC31EF006EB95B /* UIBarButtonItem+Action.swift in Sources */,
-				CA2861CB1ED6B08300BB327A /* InputSubject.swift in Sources */,
 				3D730DE41F673C64008534D3 /* Control+Action.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -728,7 +701,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CA2861CC1ED6B08400BB327A /* InputSubject.swift in Sources */,
 				C41E08EF2237D2700039D213 /* Action+Extensions.swift in Sources */,
 				3D730DE51F673C65008534D3 /* Control+Action.swift in Sources */,
 				1FCDDA8A1EAC329E006EB95B /* Action.swift in Sources */,
@@ -743,7 +715,6 @@
 			files = (
 				FA3F973C1EDAF46F00A84787 /* Action.swift in Sources */,
 				FA3F973D1EDAF46F00A84787 /* Action+Internal.swift in Sources */,
-				FA3F973E1EDAF46F00A84787 /* InputSubject.swift in Sources */,
 				C41E08F02237D2740039D213 /* Action+Extensions.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -753,9 +724,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				3DD965DE1F5DF8C500C180FE /* BindToTests.swift in Sources */,
-				3DD965C61F5DC2E100C180FE /* ActionTests.swift in Sources */,
+				C4BFF3412282B79F00D1AA27 /* TestEvents.swift in Sources */,
+				C4BFF33E2281D6E100D1AA27 /* Nimble+RxTest+Ext.swift in Sources */,
 				3DD965DF1F5DF8C900C180FE /* NSButtonTests.swift in Sources */,
-				3DD965C81F5DC2E700C180FE /* InputSubjectTests.swift in Sources */,
+				C4D3237F2285AEAD004B05A5 /* ActionTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -763,13 +735,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C4BFF3402282B79F00D1AA27 /* TestEvents.swift in Sources */,
 				7F0569F71DE288EB007E1D0D /* BarButtonTests.swift in Sources */,
 				5ED520241E1EA199007621B9 /* BindToTests.swift in Sources */,
 				7F0569F61DE288EB007E1D0D /* AlertActionTests.swift in Sources */,
-				7F0569F51DE288EB007E1D0D /* ActionTests.swift in Sources */,
+				C4D3237E2285ADF7004B05A5 /* ActionTests.swift in Sources */,
 				7B4BFE6320C290BF00D72FB0 /* RefreshControlTests.swift in Sources */,
+				C4BFF33D2281D6E100D1AA27 /* Nimble+RxTest+Ext.swift in Sources */,
 				7F0569F81DE288EB007E1D0D /* ButtonTests.swift in Sources */,
-				CA2861CA1ED6A41700BB327A /* InputSubjectTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -792,7 +765,6 @@
 				7F0569ED1DE28587007E1D0D /* UIBarButtonItem+Action.swift in Sources */,
 				C4DE00052229758700FB50AB /* Action+Extensions.swift in Sources */,
 				3D730DE91F673FD9008534D3 /* Button+Action.swift in Sources */,
-				CA2861C81ED6979400BB327A /* InputSubject.swift in Sources */,
 				3D730DE31F673BE4008534D3 /* Control+Action.swift in Sources */,
 				7F0569EA1DE28587007E1D0D /* Action.swift in Sources */,
 			);
@@ -1021,10 +993,7 @@
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
@@ -1055,10 +1024,7 @@
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
@@ -1093,7 +1059,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1113,7 +1079,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/iOS";
 				PRODUCT_BUNDLE_IDENTIFIER = "-.Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1204,7 +1170,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Sources/Action/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1260,7 +1226,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Sources/Action/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -1293,7 +1259,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1317,7 +1283,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ashfurrow.Action;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/Cartfile b/Cartfile
index 0fb6d5b8..b96a6ddc 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 4.4.2
+github "ReactiveX/RxSwift" >= 6.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
index e4195453..f8760ef9 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v8.0.1"
-github "Quick/Quick" "v2.0.0"
-github "ReactiveX/RxSwift" "4.4.2"
+github "Quick/Nimble" "v9.0.0"
+github "Quick/Quick" "v3.1.2"
+github "ReactiveX/RxSwift" "6.1.0"
diff --git a/Changelog.md b/Changelog.md
index c64903af..b1d20155 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,187 +1 @@
-Changelog
-=========
-
-
-Current master
---------------
-3.11.0
--------
-- Introduction of  `underlyingError` observable which returns a `Swift.Error`  element type. 
-- Updated specs that were breaking in `Circle CI` pipeline 
-
-3.10.2
--------
-- Update the project and xcworkspace and make it compatible with Version 10.1 (10B61)
-- Update the Unit test target and make it compatible with Version 10.1 (10B61)
-- Moved CI to circle CI 2.0
-- Fix issue [#155](https://github.com/RxSwiftCommunity/Action/issues/155)
-- Fix issue [#179](https://github.com/RxSwiftCommunity/Action/issues/179)
-
-3.10.0
--------
-- Adding syntax sugar `execute()` method on `Action` when `Input` is `Void`. [#171](https://github.com/RxSwiftCommunity/Action/pull/171)
-- Raises minimum watchOS deployment target to 3.0, to match RxSwift.
-
-3.9.1
------
-
-- Less restrictive RxSwift/RxCocoa dependencies in podspec, now supporting RxSwift/RxCocoa 4.x starting with version 4.3
-
-3.9.0
------
-- Fix Action Demo build failure
-- Added missing support for Swift 4.2 after 3.7.0
-
-
-3.8.0
------
-
-- Fix build failure on New Build System (default on Xcode 10) [#151](https://github.com/RxSwiftCommunity/Action/pull/151)
-
-3.7.0
------
-- Added full support for Swift 4.2
-- Added full support for RxSwift 4.3
-
-3.6.0
------
-- Updated `Semantic Versioning` to reflect what is actaully released both on `Pod`  and `Carthage`
-- Added full support for Swift 4.1
-- Added full support for RxSwift 4.2.0
-- UIRefreshControl support: binding to an action (or CocoaAction) starts the action itself and updates the control's refreshing status
-
-3.5.0
------
-
-- Add convenience initializer with work factories returning `PrimitiveSequence` or any other `ObservableConvertibleType` [#125](https://github.com/RxSwiftCommunity/Action/pull/125)
-- Introduce `CompletableAction`, a typealias for action that only completes without emitting any elements [#125](https://github.com/RxSwiftCommunity/Action/pull/125)
-
-3.4.0
------
-- Added full support for Swift 4.0
-- Added full support for RxSwift 4.0.0
-- Preserved old behavior for `shareReplay(1)` api changes from `RxSwift`. [#110](https://github.com/RxSwiftCommunity/Action/pull/110)
-
-
-Version table
--------------
-
-| Swift version | RxSwift version | Action version |
-| ------------- | --------------- | -------------- |
-| Swift 3.0     | v3.2.*   	      | v2.2.0 		   |
-| Swift 3.2     | v3.6.*   	      | v3.2.0 		   |
-| **Swift 4**   | **v4.0.0**      | **v3.4.0**     |
-| Swift 4.1    | **v4.2.0**      | **v3.6.0**     |
-
-3.2.0
------
-- Add macOS bindings for NSControl and NSButton
-
-3.1.1
------
-
-- Loosens dependency on RxSwift.
-
-3.1.0
------
-
-- Replace `PublishSubject` with `InputSubject` [#92](https://github.com/RxSwiftCommunity/Action/pull/92)
-- Added missing sources for watchOS target [#95](https://github.com/RxSwiftCommunity/Action/pull/95)
-
-3.0.0
------
-
-- Change `bindTo([...])` methods to `bind(to: [...])` to better align with the revised Rx API
-- Update Rx invocations to resolve deprecation warnings related to same
-
-2.2.2
------
-
-- Remove `RxBlocking` from Linked Libraries in `Action` target
-
-2.2.1
------
-
-- Loosens dependency on RxSwift.
-
-2.2.0
------
-
-- Fixes [#63](https://github.com/RxSwiftCommunity/Action/issues/63), related to the default enabled state.
-- Adds `bindTo(action:)` for non-CocoaAction.
-
-2.1.1
------
-
-- Not replay `executionObservables` to fix `execute(_:)`. See [#64](https://github.com/RxSwiftCommunity/Action/pull/56).
-
-2.1.0
------
-
-- Refactors internal implementation. See [#56](https://github.com/RxSwiftCommunity/Action/pull/56) and [#59](https://github.com/RxSwiftCommunity/Action/pull/59).
-- Adds SwiftPM support. See [#58](https://github.com/RxSwiftCommunity/Action/pull/58).
-
-2.0.0-beta.1
-------------
-
-- Adds Swift 3 support. See [#46](https://github.com/RxSwiftCommunity/Action/pull/46).
-
-1.2.2
------
-
-- Added inputs subject to trigger actins by observables. See [#37](https://github.com/RxSwiftCommunity/Action/pull/37).
-- Fixes a problem with observable deallocation related to `rx_action` button property. See [#33](https://github.com/RxSwiftCommunity/Action/pull/33).
-- Improved Carthage compatibility. See [#34](https://github.com/RxSwiftCommunity/Action/pull/34).
-- Swift 2.3 support.
-
-1.2.1
------
-
-- Relaxes dependency requirements.
-
-1.2.0
------
-
-- Updates to RxSwift 2.1.0.
-
-1.1.0
------
-
-- Transitioned podspec to new remote URL (see [#15](https://github.com/RxSwiftCommunity/Action/issues/15)).
-- Moved to RxSwift 2.0 🎉
-
-1.2.2
------
-
-- Fixes memory leak when used on buttons. See [#21](https://github.com/RxSwiftCommunity/Action/issues/21).
-
-1.2.1
------
-
-- Relaxes dependency requirements.
-
-1.0.0
------
-
-- Unbounded replaying of event values (see [#3](https://github.com/ashfurrow/Action/issues/3)).
-
-0.3.0
------
-
-Added `UIAlertAction` support.
-
-0.2.1
------
-
-- Fixes `enabledIf:` parameter to be `Observable<B>`, `where B: BooleanType`.
-
-0.2.0
------
-
-- Added tvOS support to UIButton extension.
-- Changes `enabledIf` to accept `Observable<BooleanType>` instead of `Bool`.
-
-0.1.0
------
-
-- Initial release.
+#  
diff --git a/Demo/Base.lproj/Main.storyboard b/Demo/Base.lproj/Main.storyboard
index 08fa0bd8..10ba31f7 100644
--- a/Demo/Base.lproj/Main.storyboard
+++ b/Demo/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="gBp-2p-Zj2">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="gBp-2p-Zj2">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -48,8 +48,8 @@
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" misplaced="YES" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="OrY-7C-i77">
-                                <rect key="frame" x="290" y="496" width="20" height="20"/>
+                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="OrY-7C-i77">
+                                <rect key="frame" x="177.5" y="563" width="20" height="20"/>
                             </activityIndicatorView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rn7-U4-1tI">
                                 <rect key="frame" x="131" y="107" width="113" height="30"/>
diff --git a/Demo/ViewController.swift b/Demo/ViewController.swift
index 415f907a..3f21044b 100644
--- a/Demo/ViewController.swift
+++ b/Demo/ViewController.swift
@@ -29,7 +29,7 @@ class ViewController: UIViewController {
     var disposableBag = DisposeBag()
     let sharedAction = Action<SharedInput, String> { input in
         switch input {
-        case .barButton: return Observable.just("UIBarButtonItem with 3 seconds delay").delaySubscription(3, scheduler: MainScheduler.instance)
+        case .barButton: return Observable.just("UIBarButtonItem with 3 seconds delay").delaySubscription(.seconds(3), scheduler: MainScheduler.instance)
         case .button(let title): return .just("UIButton " + title)
         }
     }
@@ -39,20 +39,20 @@ class ViewController: UIViewController {
 
         // Demo: add an action to a button in the view
         let action = CocoaAction {
-			print("Button was pressed, showing an alert and keeping the activity indicator spinning while alert is displayed")
+            print("Button was pressed, showing an alert and keeping the activity indicator spinning while alert is displayed")
             return Observable.create { [weak self] observer -> Disposable in
-				// Demo: show an alert and complete the view's button action once the alert's OK button is pressed
-				let alertController = UIAlertController(title: "Hello world", message: "This alert was triggered by a button action", preferredStyle: .alert)
-				var ok = UIAlertAction.Action("OK", style: .default)
-				ok.rx.action = CocoaAction {
-					print("Alert's OK button was pressed")
-					observer.onCompleted()
-					return .empty()
-				}
-				alertController.addAction(ok)
-				self?.present(alertController, animated: true, completion: nil)
+                // Demo: show an alert and complete the view's button action once the alert's OK button is pressed
+                let alertController = UIAlertController(title: "Hello world", message: "This alert was triggered by a button action", preferredStyle: .alert)
+                var ok = UIAlertAction.Action("OK", style: .default)
+                ok.rx.action = CocoaAction {
+                    print("Alert's OK button was pressed")
+                    observer.onCompleted()
+                    return .empty()
+                }
+                alertController.addAction(ok)
+                self?.present(alertController, animated: true, completion: nil)
 
-				return Disposables.create()
+                return Disposables.create()
             }
         }
         
@@ -61,7 +61,7 @@ class ViewController: UIViewController {
         // Demo: add an action to a UIBarButtonItem in the navigation item
         self.navigationItem.rightBarButtonItem?.rx.action = CocoaAction {
             print("Bar button item was pressed, simulating a 2 second action")
-            return Observable.empty().delaySubscription(2, scheduler: MainScheduler.instance)
+            return Observable.empty().delaySubscription(.seconds(2), scheduler: MainScheduler.instance)
         }
 
         // Demo: observe the output of both actions, spin an activity indicator
@@ -92,7 +92,7 @@ class ViewController: UIViewController {
         }
         self.navigationItem.leftBarButtonItem?.rx.bind(to: sharedAction, input: .barButton)
 
-        sharedAction.executing.debounce(0, scheduler: MainScheduler.instance).subscribe(onNext: { [weak self] executing in
+        sharedAction.executing.debounce(.seconds(0), scheduler: MainScheduler.instance).subscribe(onNext: { [weak self] executing in
             if (executing) {
                 self?.activityIndicator.startAnimating()
             }
@@ -100,12 +100,12 @@ class ViewController: UIViewController {
                 self?.activityIndicator.stopAnimating()
             }
         })
-        .disposed(by: self.disposableBag)
+            .disposed(by: self.disposableBag)
 
         sharedAction.elements.subscribe(onNext: { string in
             print(string  + " pressed")
         })
-        .disposed(by: self.disposableBag)
+            .disposed(by: self.disposableBag)
         
         
         var refreshControl = UIRefreshControl()
@@ -114,10 +114,10 @@ class ViewController: UIViewController {
             print("Reloading was triggered!")
             return Observable
                 .empty()
-                .delaySubscription(2, scheduler: MainScheduler.instance)
+                .delaySubscription(.seconds(2), scheduler: MainScheduler.instance)
                 .do(onCompleted:{
                     print ("Reloading completed!")
-            })
+                })
         }
     }
 }
diff --git a/License.md b/License.md
index 06c3128c..8d4eca68 100644
--- a/License.md
+++ b/License.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Ash Furrow
+Copyright (c) 2021 Ash Furrow
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Package.resolved b/Package.resolved
index b77b1084..402d4d2f 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "12cccb171ad9038251af6883807f0290c1d75a5b",
-          "version": "4.0.0"
+          "revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa",
+          "version": "5.1.1"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
index fbef694a..fc2811d4 100644
--- a/Package.swift
+++ b/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
             targets: ["Action"]),
         ],
     dependencies: [
-        .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "4.0.0")
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
diff --git a/Readme.md b/Readme.md
index d09c6f1e..5a8dee8a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,4 +1,4 @@
-[![CircleCI](https://circleci.com/gh/RxSwiftCommunity/Action.svg?style=svg)](https://circleci.com/gh/RxSwiftCommunity/Action)
+[![CI](https://github.com/RxSwiftCommunity/Action/actions/workflows/ci.yml/badge.svg)](https://github.com/RxSwiftCommunity/Action/actions/workflows/ci.yml)
 
 Action
 ======
@@ -7,13 +7,15 @@ This library is used with [RxSwift](https://github.com/ReactiveX/RxSwift) to pro
 
 An action is a way to say "hey, later I'll need you to subscribe to this thing." It's actually a lot more involved than that.
 
-Actions accept a `workFactory`: a closure that takes some input and produces an observable. When `execute()` is called, it passes its parameter to this closure and subscribes to the work.
+Actions accept a `workFactory`: a closure that takes some input and produces an observable. When `execute()` is called on the action, the `workFactory` gets passed this parameter and the action subscribes to the observable that gets returned.
+
+An action:
 
 - Can only be executed while "enabled" (`true` if unspecified).
-- Only execute one thing at a time.
+- Only executes one thing at a time.
 - Aggregates next/error events across individual executions.
 
-Oh, and it has this really swift thing with `UIButton` that's pretty cool. It'll manage the button's enabled state, make sure the button is disabled while your work is being done, all that stuff 👍
+Oh, and it has this really Swift thing with `UIButton` that's pretty cool. It'll manage the button's enabled state, make sure the button is disabled while your work is being done, all that stuff 👍
 
 Usage
 -----
@@ -46,7 +48,7 @@ action: Action<String, Bool> = Action(enabledIf: validEmailAddress, workFactory:
 
 Now `execute()` only does the work if the email address is valid. Super cool!
 
-Note that `enabledIf` isn't the same as the `enabled` property. You pass in `enabledIf` and the action uses that, and its current executing state, to determine if it's currently enabled.
+(Note that `enabledIf` isn't the same as the `enabled` property. You pass in `enabledIf` and the action uses that (combined with its current executing state) to determine if it's currently enabled.)
 
 What's _really_ cool is the `UIButton` extension. It accepts a `CocoaAction`, which is just `Action<Void, Void>`.
 
@@ -74,7 +76,7 @@ button2.rx.bindTo(action) { _ in return "Goodbye"}
 
 `button1` and `button2` are sharing the same `Action`, but they are feeding it with different input (`Hello` and `Goodbye` that will be printed for corresponding tap).
 
-A more complex use case can be a single action related to a `UIViewController` that manages your navigation, error handling and loading state. With this approach, you can have as many `UIButton`s (or `UIBarButtonItem`s) as you want and subscribe to `executing`, `errors` and `elements` once and in a single common place.
+A more complex use case can be a single action related to a `UIViewController` that manages your navigation, error handling and loading state. With this approach, you can have as many `UIButton`s (or `UIBarButtonItem`s) as you want and subscribe to `executing`, `errors`, `elements` and `completions` once and in a single common place.
 
 There's also a really cool extension on `UIAlertAction`, used by [`UIAlertController`](http://ashfurrow.com/blog/uialertviewcontroller-example/). One catch: because of the limitations of that class, you can't instantiate it with the normal initializer. Instead, call this class method:
 
@@ -100,15 +102,15 @@ Then run `pod install` and that'll be 👌
 Add this to `Cartfile`
 
 ```
-github "RxSwiftCommunity/Action" ~> 3.6.0
+github "RxSwiftCommunity/Action" ~> 5.0.0
 ```
 
 If you are using RxSwift 3.2.0 or below, Use Action `~2.2.0` instead!
 
 then run
 
-```
-$ carthage update
+```sh
+> carthage update
 ```
 
 Thanks
diff --git a/Sources/Action/Action+Extensions.swift b/Sources/Action/Action+Extensions.swift
index 1d875b80..e1ae97de 100644
--- a/Sources/Action/Action+Extensions.swift
+++ b/Sources/Action/Action+Extensions.swift
@@ -21,3 +21,16 @@ public extension Action where Input == Void {
         return execute(())
     }
 }
+
+public extension CompletableAction {
+    /// Emits everytime work factory completes.
+    var completions: Observable<Void> {
+        return executionObservables
+            .flatMap { execution in
+                execution.flatMap { _ in Observable<Void?>.empty() }
+                    .concat(Observable<Void?>.just(()))
+                    .catchAndReturn(nil)
+            }
+            .compactMap { $0 }
+    }
+}
diff --git a/Sources/Action/Action.swift b/Sources/Action/Action.swift
index 8ed51961..dbd5fa75 100644
--- a/Sources/Action/Action.swift
+++ b/Sources/Action/Action.swift
@@ -25,11 +25,8 @@ public final class Action<Input, Element> {
     public let _enabledIf: Observable<Bool>
     public let workFactory: WorkFactory
 
-    /// Inputs that triggers execution of action.
-    /// This subject also includes inputs as aguments of execute().
-    /// All inputs are always appear in this subject even if the action is not enabled.
-    /// Thus, inputs count equals elements count + errors count.
-    public let inputs = InputSubject<Input>()
+    /// Bindable sink for inputs that triggers execution of action.
+    public let inputs: AnyObserver<Input>
 
     /// Errors aggrevated from invocations of execute().
     /// Delivered on whatever scheduler they were sent from.
@@ -57,7 +54,7 @@ public final class Action<Input, Element> {
     public convenience init<O: ObservableConvertibleType>(
         enabledIf: Observable<Bool> = Observable.just(true),
         workFactory: @escaping (Input) -> O
-    ) where O.E == Element {
+    ) where O.Element == Element {
         self.init(enabledIf: enabledIf) {
             workFactory($0).asObservable()
         }
@@ -73,31 +70,37 @@ public final class Action<Input, Element> {
         let enabledSubject = BehaviorSubject<Bool>(value: false)
         enabled = enabledSubject.asObservable()
 
-        let errorsSubject = PublishSubject<ActionError>()
-        errors = errorsSubject.asObservable()
+        let errorRelay = PublishRelay<ActionError>()
+        errors = errorRelay.asObservable()
 
-        executionObservables = inputs
+        let inputsRelay = PublishRelay<Input>()
+        inputs = AnyObserver { event in
+            guard case .next(let value) = event else { return }
+            inputsRelay.accept(value)
+        }
+
+        executionObservables = inputsRelay
             .withLatestFrom(enabled) { input, enabled in (input, enabled) }
             .flatMap { input, enabled -> Observable<Observable<Element>> in
                 if enabled {
                     return Observable.of(workFactory(input)
-                                             .do(onError: { errorsSubject.onNext(.underlyingError($0)) })
+                                             .do(onError: { errorRelay.accept(.underlyingError($0)) })
                                              .share(replay: 1, scope: .forever))
                 } else {
-                    errorsSubject.onNext(.notEnabled)
+                    errorRelay.accept(.notEnabled)
                     return Observable.empty()
                 }
             }
             .share()
 
         elements = executionObservables
-            .flatMap { $0.catchError { _ in Observable.empty() } }
+            .flatMap { $0.catch { _ in Observable.empty() } }
 
         executing = executionObservables.flatMap {
                 execution -> Observable<Bool> in
                 let execution = execution
                     .flatMap { _ in Observable<Bool>.empty() }
-                    .catchError { _ in Observable.empty() }
+                    .catch { _ in Observable.empty() }
 
                 return Observable.concat([Observable.just(true),
                                           execution,
@@ -121,7 +124,7 @@ public final class Action<Input, Element> {
 		let subject = ReplaySubject<Element>.createUnbounded()
 
 		let work = executionObservables
-			.map { $0.catchError { throw ActionError.underlyingError($0) } }
+			.map { $0.catch { throw ActionError.underlyingError($0) } }
 
 		let error = errors
 			.map { Observable<Element>.error($0) }
diff --git a/Sources/Action/CommonUI/Control+Action.swift b/Sources/Action/CommonUI/Control+Action.swift
index 484e71d2..add19490 100644
--- a/Sources/Action/CommonUI/Control+Action.swift
+++ b/Sources/Action/CommonUI/Control+Action.swift
@@ -20,7 +20,9 @@ public extension Reactive where Base: Control {
 
 		// For each tap event, use the inputTransform closure to provide an Input value to the action
 		controlEvent
-			.map { inputTransform(self.base) }
+			.withUnretained(self.base)
+			.map(\.0)
+			.map(inputTransform)
 			.bind(to: action.inputs)
 			.disposed(by: self.base.actionDisposeBag)
 
diff --git a/Sources/Action/InputSubject.swift b/Sources/Action/InputSubject.swift
deleted file mode 100644
index e4fcb211..00000000
--- a/Sources/Action/InputSubject.swift
+++ /dev/null
@@ -1,93 +0,0 @@
-import Foundation
-import RxSwift
-
-/// A special subject for Action.inputs. It only emits `.next` event.
-public class InputSubject<Element>: ObservableType, Cancelable, SubjectType, ObserverType {
-
-    public typealias E = Element
-    typealias Key = UInt
-
-    /// Indicates whether the subject has any observers
-    public var hasObservers: Bool {
-        _lock.lock()
-        let count = _observers.count > 0
-        _lock.unlock()
-        return count
-    }
-
-    // state
-    private let _lock = NSRecursiveLock()
-    private var _nextKey: Key = 0
-    private var _observers: [Key: (Event<Element>) -> Void] = [:]
-    private var _isDisposed = false
-
-    /// Indicates whether the subject has been isDisposed.
-    public var isDisposed: Bool {
-        _lock.lock()
-        let isDisposed = _isDisposed
-        _lock.unlock()
-        return isDisposed
-    }
-
-    /// Creates a subject.
-    public init() {
-        #if TRACE_RESOURCES
-        _ = Resources.incrementTotal()
-        #endif
-    }
-
-    /// Notifies all subscribed observers abount only `.next` event.
-    ///
-    /// - parameter event: Event to send to the observers.
-    public func on(_ event: Event<Element>) {
-        _lock.lock()
-        switch event {
-        case .next where !_isDisposed:
-            _observers.values.forEach { $0(event) }
-        default:
-            break
-        }
-        _lock.unlock()
-    }
-
-    /**
-     Subscribes an observer to the subject.
-
-     - parameter observer: Observer to subscribe to the subject.
-     - returns: Disposable object that can be used to unsubscribe the observer from the subject.
-     */
-    public func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
-        _lock.lock()
-
-        if _isDisposed {
-            observer.on(.error(RxError.disposed(object: self)))
-            return Disposables.create()
-        }
-
-        let key = _nextKey
-        _nextKey += 1
-        _observers[key] = observer.on
-        _lock.unlock()
-
-        return Disposables.create { [weak self] in
-            self?._lock.lock()
-            self?._observers.removeValue(forKey: key)
-            self?._lock.unlock()
-        }
-    }
-
-    /// Unsubscribe all observers and release resources.
-    public func dispose() {
-        _lock.lock()
-        _isDisposed = true
-        _observers.removeAll()
-        _lock.unlock()
-    }
-
-    #if TRACE_RESOURCES
-    deinit {
-        _ = Resources.decrementTotal()
-    }
-    #endif
-
-}
diff --git a/Sources/Action/UIKitExtensions/UIBarButtonItem+Action.swift b/Sources/Action/UIKitExtensions/UIBarButtonItem+Action.swift
index d2d9a32f..6c226f5f 100644
--- a/Sources/Action/UIKitExtensions/UIBarButtonItem+Action.swift
+++ b/Sources/Action/UIKitExtensions/UIBarButtonItem+Action.swift
@@ -42,7 +42,9 @@ public extension Reactive where Base: UIBarButtonItem {
         unbindAction()
 
         self.tap
-            .map { inputTransform(self.base) }
+            .withUnretained(self.base)
+            .map(\.0)
+            .map(inputTransform)
             .bind(to: action.inputs)
             .disposed(by: self.base.actionDisposeBag)
 
diff --git a/Sources/Action/UIKitExtensions/UIRefreshControl+Action.swift b/Sources/Action/UIKitExtensions/UIRefreshControl+Action.swift
index b5560c7a..1b66c64d 100644
--- a/Sources/Action/UIKitExtensions/UIRefreshControl+Action.swift
+++ b/Sources/Action/UIKitExtensions/UIRefreshControl+Action.swift
@@ -34,7 +34,9 @@ public extension Reactive where Base: UIRefreshControl {
         unbindAction()
 
         self.controlEvent(.valueChanged)
-            .map { inputTransform(self.base)}
+            .withUnretained(self.base)
+            .map(\.0)
+            .map(inputTransform)
             .bind(to: action.inputs)
             .disposed(by: self.base.actionDisposeBag)
 
diff --git a/Tests/ActionTests.swift b/Tests/ActionTests.swift
new file mode 100644
index 00000000..2ae9d4cf
--- /dev/null
+++ b/Tests/ActionTests.swift
@@ -0,0 +1,569 @@
+import Quick
+import Nimble
+import RxSwift
+import RxTest
+@testable import Action
+
+class ActionTests: QuickSpec {
+    override func spec() {
+        var scheduler: TestScheduler!
+        var disposeBag: DisposeBag!
+        
+        beforeEach {
+            scheduler = TestScheduler(initialClock: 0)
+            disposeBag = DisposeBag()
+        }
+        
+        describe("completable action") {
+            var inputs: TestableObserver<String>!
+            var action: CompletableAction<String>!
+            
+            beforeEach {
+                inputs = scheduler.createObserver(String.self)
+                action = CompletableAction { input -> Completable in
+                    inputs.onNext(input)
+                    return Observable<Never>.empty().asCompletable()
+                }
+                scheduler.scheduleAt(10) { action.inputs.onNext("a") }
+                scheduler.scheduleAt(20) { action.inputs.onNext("b") }
+            }
+            
+            afterEach {
+                action = nil
+            }
+            
+            it("receives generated inputs") {
+                scheduler.start()
+                expect(inputs.events).to(match(TestEvents.inputs))
+            }
+            it("emits nothing on `elements`") {
+                let elements = scheduler.createObserver(Never.self)
+                action.elements.bind(to: elements).disposed(by: disposeBag)
+                scheduler.start()
+                expect(elements.events.count).to(match(0))
+            }
+            it("emits on `completions` when completed") {
+                let completions = scheduler.createObserver(Void.self)
+                action.completions.bind(to: completions).disposed(by: disposeBag)
+                scheduler.start()
+                expect(completions.events.contains { $0.time == 10}).to(beTrue())
+                expect(completions.events.contains { $0.time == 20}).to(beTrue())
+            }
+        }
+        describe("completable action finished with error") {
+            var action: CompletableAction<Error?>!
+            beforeEach {
+                action = CompletableAction { errorMaybe -> Completable in
+                    if let error = errorMaybe {
+                        return Observable<Never>.error(error).asCompletable()
+                    } else {
+                        return Observable<Never>.empty().asCompletable()
+                    }
+                    
+                }
+                scheduler.scheduleAt(10) { action.inputs.onNext(TestError) }
+                scheduler.scheduleAt(20) { action.inputs.onNext(nil) }
+            }
+            afterEach {
+                action = nil
+            }
+            it("emits no errors on `completions`") {
+                let completions = scheduler.createObserver(Void.self)
+                action.completions.bind(to: completions).disposed(by: disposeBag)
+                
+                scheduler.start()
+                
+                expect(completions.events.contains { $0.time == 10 }).to(beFalse())
+                expect(completions.events.contains { $0.time == 20 }).to(beTrue())
+            }
+        }
+        
+        describe("Input observer behavior") {
+            var action: Action<String, String>!
+            var inputs: TestableObserver<String>!
+            var executions: TestableObserver<Observable<String>>!
+            beforeEach {
+                inputs = scheduler.createObserver(String.self)
+                action = Action {
+                    inputs.onNext($0)
+                    return Observable.just($0)
+                }
+                executions = scheduler.createObserver(Observable<String>.self)
+                action.executionObservables.bind(to: executions).disposed(by: disposeBag)
+            }
+            afterEach {
+                action = nil
+                inputs = nil
+                executions = nil
+            }
+            
+            it("execute on .next") {
+                scheduler.scheduleAt(10) { action.inputs.onNext("a") }
+                scheduler.start()
+                expect(executions.events.filter { $0.value.isStopEvent }).to(beEmpty())
+            }
+            it("ignore .error events") {
+                scheduler.scheduleAt(10) { action.inputs.onError(TestError) }
+                scheduler.start()
+                expect(executions.events.filter { $0.value.isStopEvent }).to(beEmpty())
+            }
+            it("ignore .completed events") {
+                scheduler.scheduleAt(10) { action.inputs.onCompleted() }
+                scheduler.start()
+                expect(executions.events.filter { $0.value.isStopEvent }).to(beEmpty())
+                expect(inputs.events.isEmpty).to(beTrue())
+            }
+            it("accept multiple .next events") {
+                scheduler.scheduleAt(10) { action.inputs.onNext("a") }
+                scheduler.scheduleAt(20) { action.inputs.onNext("b") }
+                scheduler.start()
+                expect(inputs.events).to(match(TestEvents.inputs))
+                let executionsCount = executions.events.filter { !$0.value.isStopEvent }.count
+                expect(executionsCount).to(match(2))
+            }
+            it("not terminate after .error event") {
+                scheduler.scheduleAt(10) { action.inputs.onError(TestError) }
+                scheduler.scheduleAt(20) { action.inputs.onNext("b") }
+                scheduler.start()
+                expect(inputs.events).to(match(Recorded.events([.next(20, "b")])))
+                let executionsCount = executions.events.filter { !$0.value.isStopEvent }.count
+                expect(executionsCount).to(match(1))
+            }
+            it("not terminate after .completed event") {
+                scheduler.scheduleAt(10) { action.inputs.onCompleted() }
+                scheduler.scheduleAt(20) { action.inputs.onNext("b") }
+                scheduler.start()
+                expect(inputs.events).to(match(Recorded.events([.next(20, "b")])))
+                let executionsCount = executions.events.filter { !$0.value.isStopEvent }.count
+                expect(executionsCount).to(match(1))
+            }
+        }
+        
+        describe("action properties") {
+            var inputs: TestableObserver<String>!
+            var elements: TestableObserver<String>!
+            var errors: TestableObserver<ActionError>!
+            var enabled: TestableObserver<Bool>!
+            var executing: TestableObserver<Bool>!
+            var executionObservables: TestableObserver<Observable<String>>!
+            var underlyingError: TestableObserver<Error>!
+            
+            beforeEach {
+                inputs = scheduler.createObserver(String.self)
+                elements = scheduler.createObserver(String.self)
+                errors = scheduler.createObserver(ActionError.self)
+                enabled = scheduler.createObserver(Bool.self)
+                executing = scheduler.createObserver(Bool.self)
+                executionObservables = scheduler.createObserver(Observable<String>.self)
+                underlyingError = scheduler.createObserver(Error.self)
+            }
+            
+            func buildAction(enabledIf: Observable<Bool> = Observable.just(true),
+                             factory: @escaping (String) -> Observable<String>) -> Action<String, String> {
+                let action = Action<String, String>(enabledIf: enabledIf) {
+                    inputs.onNext($0)
+                    return factory($0)
+                }
+                
+                action.elements
+                    .bind(to: elements)
+                    .disposed(by: disposeBag)
+                
+                action.errors
+                    .bind(to: errors)
+                    .disposed(by: disposeBag)
+                
+                action.enabled
+                    .bind(to: enabled)
+                    .disposed(by: disposeBag)
+                
+                action.executing
+                    .bind(to: executing)
+                    .disposed(by: disposeBag)
+                
+                action.executionObservables
+                    .bind(to: executionObservables)
+                    .disposed(by: disposeBag)
+                
+                action.underlyingError
+                    .bind(to: underlyingError)
+                    .disposed(by: disposeBag)
+                
+                // Dummy subscription for multiple subcription tests
+                action.elements.subscribe().disposed(by: disposeBag)
+                action.errors.subscribe().disposed(by: disposeBag)
+                action.enabled.subscribe().disposed(by: disposeBag)
+                action.executing.subscribe().disposed(by: disposeBag)
+                action.executionObservables.subscribe().disposed(by: disposeBag)
+                action.underlyingError.subscribe().disposed(by: disposeBag)
+                
+                return action
+            }
+            
+            describe("single element action") {
+                sharedExamples("send elements to elements observable") {
+                    it("work factory receives inputs") {
+                        expect(inputs.events).to(match(TestEvents.inputs))
+                    }
+                    it("elements observable receives generated elements") {
+                        expect(elements.events).to(match(TestEvents.elements))
+                    }
+                    it("errors observable receives nothing") {
+                        expect(errors.events.isEmpty).to(beTrue())
+                    }
+                    it("disabled until element returns") {
+                        expect(enabled.events).to(match(TestEvents.disabled))
+                    }
+                    it("executing until element returns") {
+                        expect(executing.events).to(match(TestEvents.executing))
+                    }
+                    it("executes twice") {
+                        expect(executionObservables.events.count) == 2
+                    }
+                }
+                
+                var action: Action<String, String>!
+                
+                beforeEach {
+                    action = buildAction { Observable.just($0) }
+                }
+                
+                context("trigger via inputs subject") {
+                    beforeEach {
+                        scheduler.scheduleAt(10) { action.inputs.onNext("a") }
+                        scheduler.scheduleAt(20) { action.inputs.onNext("b") }
+                        scheduler.start()
+                    }
+                    
+                    itBehavesLike("send elements to elements observable")
+                }
+                
+                context("trigger via execute() method") {
+                    beforeEach {
+                        scheduler.scheduleAt(10) { action.execute("a") }
+                        scheduler.scheduleAt(20) { action.execute("b") }
+                        scheduler.start()
+                    }
+                    
+                    itBehavesLike("send elements to elements observable")
+                }
+            }
+            
+            describe("multiple element action") {
+                sharedExamples("send array elements to elements observable") {
+                    it("work factory receives inputs") {
+                        expect(inputs.events).to(match(TestEvents.inputs))
+                    }
+                    it("elements observable receives generated elements") {
+                        expect(elements.events).to(match(TestEvents.multipleElements))
+                    }
+                    it("errors observable receives nothing") {
+                        expect(errors.events.isEmpty).to(beTrue())
+                    }
+                    it("disabled until element returns") {
+                        expect(enabled.events).to(match(TestEvents.disabled))
+                    }
+                    it("executing until element returns") {
+                        expect(executing.events).to(match(TestEvents.executing))
+                    }
+                    it("executes twice") {
+                        expect(executionObservables.events.count).to(match(2))
+                    }
+                }
+                
+                var action: Action<String, String>!
+                
+                beforeEach {
+                    action = buildAction { input in
+                        // "a" -> ["a", "b", "c"]
+                        let baseValue = UnicodeScalar(input)!.value
+                        let strings = (baseValue..<(baseValue + 3))
+                            .compactMap { UnicodeScalar($0) }
+                            .map { String($0) }
+                        
+                        return Observable.from(strings)
+                    }
+                }
+                
+                context("trigger via inputs subject") {
+                    beforeEach {
+                        scheduler.scheduleAt(10) { action.inputs.onNext("a") }
+                        scheduler.scheduleAt(20) { action.inputs.onNext("b") }
+                        scheduler.start()
+                    }
+                    
+                    itBehavesLike("send array elements to elements observable")
+                }
+                
+                context("trigger via execute() method") {
+                    beforeEach {
+                        scheduler.scheduleAt(10) { action.execute("a") }
+                        scheduler.scheduleAt(20) { action.execute("b") }
+                        scheduler.start()
+                    }
+                    
+                    itBehavesLike("send array elements to elements observable")
+                }
+            }
+            
+            describe("error action") {
+                sharedExamples("send errors to errors observable") {
+                    it("work factory receives inputs") {
+                        expect(inputs.events).to(match(TestEvents.inputs))
+                    }
+                    it("elements observable receives nothing") {
+                        expect(elements.events.isEmpty).to(beTrue())
+                    }
+                    it("errors observable receives generated errors") {
+                        expect(errors.events).to(match(TestEvents.underlyingErrors))
+                    }
+                    it("underlyingError observable receives 2 generated errors") {
+                        expect(underlyingError.events.count).to(match(2))
+                    }
+                    it("underlyingError observable receives generated errors") {
+                        expect(underlyingError.events).to(match(with: TestEvents.elementUnderlyingErrors))
+                    }
+                    it("disabled until error returns") {
+                        expect(enabled.events).to(match(TestEvents.disabled))
+                    }
+                    it("executing until error returns") {
+                        expect(executing.events).to(match(TestEvents.executing))
+                    }
+                    it("executes twice") {
+                        expect(executionObservables.events.count).to(match(2))
+                    }
+                }
+                
+                var action: Action<String, String>!
+                
+                beforeEach {
+                    action = buildAction { _ in Observable.error(TestError) }
+                }
+                
+                context("trigger via inputs subject") {
+                    beforeEach {
+                        scheduler.scheduleAt(10) { action.inputs.onNext("a") }
+                        scheduler.scheduleAt(20) { action.inputs.onNext("b") }
+                        scheduler.start()
+                    }
+                    
+                    itBehavesLike("send errors to errors observable")
+                }
+                
+                context("trigger via execute() method") {
+                    beforeEach {
+                        scheduler.scheduleAt(10) { action.execute("a") }
+                        scheduler.scheduleAt(20) { action.execute("b") }
+                        scheduler.start()
+                    }
+                    
+                    itBehavesLike("send errors to errors observable")
+                }
+            }
+            
+            describe("disabled action") {
+                sharedExamples("send notEnabled errors to errors observable") {
+                    it("work factory receives nothing") {
+                        expect(inputs.events.isEmpty).to(beTrue())
+                    }
+                    it("elements observable receives nothing") {
+                        expect(elements.events.isEmpty).to(beTrue())
+                    }
+                    it("errors observable receives generated errors") {
+                        expect(errors.events).to(match(TestEvents.notEnabledErrors))
+                    }
+                    it("underlyingError observable receives zero generated errors") {
+                        expect(underlyingError.events.count).to(match(0))
+                    }
+                    it("disabled") {
+                        expect(enabled.events).to(match(TestEvents.false))
+                    }
+                    it("never be executing") {
+                        expect(executing.events).to(match(TestEvents.false))
+                    }
+                    it("never executes") {
+                        expect(executionObservables.events).to(beEmpty())
+                    }
+                }
+                
+                var action: Action<String, String>!
+                
+                beforeEach {
+                    action = buildAction(enabledIf: Observable.just(false)) { Observable.just($0) }
+                }
+                
+                context("trigger via inputs subject") {
+                    beforeEach {
+                        scheduler.scheduleAt(10) { action.inputs.onNext("a") }
+                        scheduler.scheduleAt(20) { action.inputs.onNext("b") }
+                        scheduler.start()
+                    }
+                    
+                    itBehavesLike("send notEnabled errors to errors observable")
+                }
+                
+                context("trigger via execute() method") {
+                    beforeEach {
+                        scheduler.scheduleAt(10) { action.execute("a") }
+                        scheduler.scheduleAt(20) { action.execute("b") }
+                        scheduler.start()
+                    }
+                    
+                    itBehavesLike("send notEnabled errors to errors observable")
+                }
+            }
+        }
+        
+        describe("execute function return value") {
+            var action: Action<String, String>!
+            var element: TestableObserver<String>!
+            var executionObservables: TestableObserver<Observable<String>>!
+            
+            beforeEach {
+                element = scheduler.createObserver(String.self)
+                executionObservables = scheduler.createObserver(Observable<String>.self)
+            }
+            
+            func bindAndExecuteTwice(action: Action<String, String>) {
+                action.executionObservables
+                    .bind(to: executionObservables)
+                    .disposed(by: disposeBag)
+                
+                scheduler.scheduleAt(10) {
+                    action.execute("a")
+                        .bind(to: element)
+                        .disposed(by: disposeBag)
+                }
+                
+                scheduler.scheduleAt(20) {
+                    action.execute("b")
+                        .bind(to: element)
+                        .disposed(by: disposeBag)
+                }
+                
+                scheduler.start()
+            }
+            
+            context("single element action") {
+                beforeEach {
+                    action = Action { Observable.just($0) }
+                    bindAndExecuteTwice(action: action)
+                }
+                
+                it("element receives single value for each execution") {
+                    expect(element.events).to(match(TestEvents.executionStreams))
+                }
+                
+                it("executes twice") {
+                    expect(executionObservables.events.count).to(match(2))
+                }
+            }
+            
+            context("multiple element action") {
+                beforeEach {
+                    action = Action { Observable.of($0, $0, $0) }
+                    bindAndExecuteTwice(action: action)
+                }
+                
+                it("element receives 3 values for each execution") {
+                    expect(element.events).to(match(TestEvents.multipleExecutionStreams))
+                }
+                it("executes twice") {
+                    expect(executionObservables.events.count).to(match(2))
+                }
+            }
+            
+            context("error action") {
+                beforeEach {
+                    action = Action { _ in Observable.error(TestError) }
+                    bindAndExecuteTwice(action: action)
+                }
+                
+                it("element fails with underlyingError") {
+                    expect(element.events).to(match(with: TestEvents.elementUnderlyingErrors))
+                }
+                it("executes twice") {
+                    expect(executionObservables.events.count) == 2
+                }
+            }
+            
+            context("disabled") {
+                beforeEach {
+                    action = Action(enabledIf: Observable.just(false)) { Observable.just($0) }
+                    bindAndExecuteTwice(action: action)
+                }
+                
+                it("element fails with notEnabled") {
+                    expect(element.events).to(match(with: TestEvents.elementNotEnabledErrors))
+                }
+                it("never executes") {
+                    expect(executionObservables.events).to(beEmpty())
+                }
+            }
+            
+            context("execute while executing") {
+                var secondElement: TestableObserver<String>!
+                var trigger: PublishSubject<Void>!
+                
+                beforeEach {
+                    secondElement = scheduler.createObserver(String.self)
+                    trigger = PublishSubject<Void>()
+                    action = Action { Observable.just($0).sample(trigger) }
+                    
+                    action.executionObservables
+                        .bind(to: executionObservables)
+                        .disposed(by: disposeBag)
+                    
+                    scheduler.scheduleAt(10) {
+                        action.execute("a")
+                            .bind(to: element)
+                            .disposed(by: disposeBag)
+                    }
+                    
+                    scheduler.scheduleAt(20) {
+                        action.execute("b")
+                            .bind(to: secondElement)
+                            .disposed(by: disposeBag)
+                    }
+                    
+                    scheduler.scheduleAt(30) {
+                        #if swift(>=3.2)
+                        trigger.onNext(())
+                        #else
+                        trigger.onNext()
+                        #endif
+                    }
+                    
+                    scheduler.start()
+                }
+                
+                it("first element receives single value") {
+                    expect(element.events).to(match(Recorded.events([.next(30, "a"), .completed(30)])))
+                }
+                it("second element fails with notEnabled error") {
+                    expect(secondElement.events).to(match(Recorded.events([.error(20, ActionError.notEnabled)])))
+                }
+                it("executes once") {
+                    expect(executionObservables.events.count).to(match(1))
+                }
+            }
+        }
+    }
+}
+
+extension ActionError: Equatable {
+    // Not accurate but convenient for testing.
+    public static func ==(lhs: ActionError, rhs: ActionError) -> Bool {
+        switch (lhs, rhs) {
+        case (.notEnabled, .notEnabled):
+            return true
+        case (.underlyingError, .underlyingError):
+            return true
+        default:
+            return false
+        }
+    }
+}
+
+extension String: Error { }
+let TestError = "Test Error"
diff --git a/Tests/ActionTests/ActionTests.swift b/Tests/ActionTests/ActionTests.swift
deleted file mode 100644
index 5d8ce029..00000000
--- a/Tests/ActionTests/ActionTests.swift
+++ /dev/null
@@ -1,599 +0,0 @@
-import Quick
-import Nimble
-import RxSwift
-import RxBlocking
-import RxTest
-@testable import Action
-
-class ActionTests: QuickSpec {
-	override func spec() {
-		var scheduler: TestScheduler!
-		var disposeBag: DisposeBag!
-		
-		beforeEach {
-			scheduler = TestScheduler(initialClock: 0)
-			disposeBag = DisposeBag()
-		}
-
-        describe("completable action") {
-            var action: CompletableAction<String>!
-            beforeEach {
-                let work: Completable = Observable<Never>.empty().asCompletable()
-                action = CompletableAction {_ in work }
-                scheduler.scheduleAt(10) { action.inputs.onNext("a") }
-                scheduler.scheduleAt(20) { action.inputs.onNext("b") }
-            }
-            afterEach {
-                action = nil
-            }
-            it("inputs subject receives generated inputs") {
-                let inputs = scheduler.createObserver(String.self)
-                action.inputs.bind(to: inputs).disposed(by: disposeBag)
-                scheduler.start()
-                XCTAssertEqual(inputs.events, [
-                    next(10, "a"),
-                    next(20, "b"),
-                    ])
-            }
-            it("emits nothing on `elements`") {
-                let elements = scheduler.createObserver(Never.self)
-                action.elements.bind(to: elements).disposed(by: disposeBag)
-                scheduler.start()
-                XCTAssertEqual(elements.events.count, 0)
-            }
-        }
-        
-		describe("action properties") {
-            var inputs: TestableObserver<String>!
-            var elements: TestableObserver<String>!
-            var errors: TestableObserver<ActionError>!
-            var enabled: TestableObserver<Bool>!
-            var executing: TestableObserver<Bool>!
-            var executionObservables: TestableObserver<Observable<String>>!
-            var underlyingError: TestableObserver<Error>!
-            
-            beforeEach {
-                inputs = scheduler.createObserver(String.self)
-                elements = scheduler.createObserver(String.self)
-                errors = scheduler.createObserver(ActionError.self)
-                enabled = scheduler.createObserver(Bool.self)
-                executing = scheduler.createObserver(Bool.self)
-                executionObservables = scheduler.createObserver(Observable<String>.self)
-                underlyingError = scheduler.createObserver(Error.self)
-            }
-			
-			func bindAction(action: Action<String, String>) {
-				action.inputs
-					.bind(to: inputs)
-					.disposed(by: disposeBag)
-				
-				action.elements
-					.bind(to: elements)
-					.disposed(by: disposeBag)
-				
-				action.errors
-					.bind(to: errors)
-					.disposed(by: disposeBag)
-				
-				action.enabled
-					.bind(to: enabled)
-					.disposed(by: disposeBag)
-				
-				action.executing
-					.bind(to: executing)
-					.disposed(by: disposeBag)
-				
-				action.executionObservables
-					.bind(to: executionObservables)
-					.disposed(by: disposeBag)
-                
-                action.underlyingError
-                    .bind(to: underlyingError)
-                    .disposed(by: disposeBag)
-				
-                // Dummy subscription for multiple subcription tests
-                action.inputs.subscribe().disposed(by: disposeBag)
-                action.elements.subscribe().disposed(by: disposeBag)
-                action.errors.subscribe().disposed(by: disposeBag)
-                action.enabled.subscribe().disposed(by: disposeBag)
-                action.executing.subscribe().disposed(by: disposeBag)
-                action.executionObservables.subscribe().disposed(by: disposeBag)
-                action.underlyingError.subscribe().disposed(by: disposeBag)
-			}
-			
-			describe("single element action") {
-				sharedExamples("send elements to elements observable") {
-					it("inputs subject receives generated inputs") {
-						XCTAssertEqual(inputs.events, [
-							next(10, "a"),
-							next(20, "b"),
-							])
-					}
-					
-					it("elements observable receives generated elements") {
-						XCTAssertEqual(elements.events, [
-							next(10, "a"),
-							next(20, "b"),
-							])
-					}
-					
-					it("errors observable receives nothing") {
-						XCTAssertEqual(errors.events, [])
-					}
-					
-					it("disabled until element returns") {
-						XCTAssertEqual(enabled.events, [
-							next(0, true),
-							next(10, false),
-							next(10, true),
-							next(20, false),
-							next(20, true),
-							])
-					}
-					
-					it("executing until element returns") {
-						XCTAssertEqual(executing.events, [
-							next(0, false),
-							next(10, true),
-							next(10, false),
-							next(20, true),
-							next(20, false),
-							])
-					}
-					
-					it("executes twice") {
-						expect(executionObservables.events.count) == 2
-					}
-				}
-				
-				var action: Action<String, String>!
-				
-				beforeEach {
-					action = Action { Observable.just($0) }
-					bindAction(action: action)
-				}
-				
-				context("trigger via inputs subject") {
-					beforeEach {
-						scheduler.scheduleAt(10) { action.inputs.onNext("a") }
-						scheduler.scheduleAt(20) { action.inputs.onNext("b") }
-						scheduler.start()
-					}
-					
-					itBehavesLike("send elements to elements observable")
-				}
-				
-				context("trigger via execute() method") {
-					beforeEach {
-						scheduler.scheduleAt(10) { action.execute("a") }
-						scheduler.scheduleAt(20) { action.execute("b") }
-						scheduler.start()
-					}
-					
-					itBehavesLike("send elements to elements observable")
-				}
-			}
-			
-			describe("multiple element action") {
-				sharedExamples("send array elements to elements observable") {
-					it("inputs subject receives generated inputs") {
-						XCTAssertEqual(inputs.events, [
-							next(10, "a"),
-							next(20, "b"),
-							])
-					}
-					
-					it("elements observable receives generated elements") {
-						XCTAssertEqual(elements.events, [
-							next(10, "a"),
-							next(10, "b"),
-							next(10, "c"),
-							next(20, "b"),
-							next(20, "c"),
-							next(20, "d"),
-							])
-					}
-					
-					it("errors observable receives nothing") {
-						XCTAssertEqual(errors.events, [])
-					}
-					
-					it("disabled until element returns") {
-						XCTAssertEqual(enabled.events, [
-							next(0, true),
-							next(10, false),
-							next(10, true),
-							next(20, false),
-							next(20, true),
-							])
-					}
-					
-					it("executing until element returns") {
-						XCTAssertEqual(executing.events, [
-							next(0, false),
-							next(10, true),
-							next(10, false),
-							next(20, true),
-							next(20, false),
-							])
-					}
-					
-					it("executes twice") {
-						expect(executionObservables.events.count) == 2
-					}
-				}
-				
-				var action: Action<String, String>!
-				
-				beforeEach {
-					action = Action { input in
-						// "a" -> ["a", "b", "c"]
-						let baseValue = UnicodeScalar(input)!.value
-						let strings = (baseValue..<(baseValue + 3))
-                            .compactMap { UnicodeScalar($0) }
-							.map { String($0) }
-						
-						return Observable.from(strings)
-					}
-					
-					bindAction(action: action)
-				}
-				
-				context("trigger via inputs subject") {
-					beforeEach {
-						scheduler.scheduleAt(10) { action.inputs.onNext("a") }
-						scheduler.scheduleAt(20) { action.inputs.onNext("b") }
-						scheduler.start()
-					}
-					
-					itBehavesLike("send array elements to elements observable")
-				}
-				
-				context("trigger via execute() method") {
-					beforeEach {
-						scheduler.scheduleAt(10) { action.execute("a") }
-						scheduler.scheduleAt(20) { action.execute("b") }
-						scheduler.start()
-					}
-					
-					itBehavesLike("send array elements to elements observable")
-				}
-			}
-			
-			describe("error action") {
-				sharedExamples("send errors to errors observable") {
-					it("inputs subject receives generated inputs") {
-						XCTAssertEqual(inputs.events, [
-							next(10, "a"),
-							next(20, "b"),
-							])
-					}
-					
-					it("elements observable receives nothing") {
-						XCTAssertEqual(elements.events, [])
-					}
-					
-					it("errors observable receives generated errors") {
-                        XCTAssertEqual(errors.events, [
-							next(10, .underlyingError(TestError)),
-							next(20, .underlyingError(TestError)),
-							])
-					}
-                    
-                    it("underlyingError observable receives 2 generated errors") {
-                        XCTAssertEqual(underlyingError.events.count, 2)
-                    }
-                    
-                    it("underlyingError observable receives generated errors") {
-                        let first = underlyingError.events[0].value.element as! String
-                        let second = underlyingError.events[1].value.element as! String
-                        XCTAssertEqual(first, TestError)
-                        XCTAssertEqual(second, TestError)
-                    }
-					
-					it("disabled until error returns") {
-						XCTAssertEqual(enabled.events, [
-							next(0, true),
-							next(10, false),
-							next(10, true),
-							next(20, false),
-							next(20, true),
-							])
-					}
-					
-					it("executing until error returns") {
-						XCTAssertEqual(executing.events, [
-							next(0, false),
-							next(10, true),
-							next(10, false),
-							next(20, true),
-							next(20, false),
-							])
-					}
-					
-					it("executes twice") {
-						expect(executionObservables.events.count) == 2
-					}
-				}
-				
-				var action: Action<String, String>!
-				
-				beforeEach {
-					action = Action { _ in Observable.error(TestError) }
-					bindAction(action: action)
-				}
-				
-				context("trigger via inputs subject") {
-					beforeEach {
-						scheduler.scheduleAt(10) { action.inputs.onNext("a") }
-						scheduler.scheduleAt(20) { action.inputs.onNext("b") }
-						scheduler.start()
-					}
-					
-					itBehavesLike("send errors to errors observable")
-				}
-				
-				context("trigger via execute() method") {
-					beforeEach {
-						scheduler.scheduleAt(10) { action.execute("a") }
-						scheduler.scheduleAt(20) { action.execute("b") }
-						scheduler.start()
-					}
-					
-					itBehavesLike("send errors to errors observable")
-				}
-			}
-			
-			describe("disabled action") {
-				sharedExamples("send notEnabled errors to errors observable") {
-					it("inputs subject receives generated inputs") {
-						XCTAssertEqual(inputs.events, [
-							next(10, "a"),
-							next(20, "b"),
-							])
-					}
-					
-					it("elements observable receives nothing") {
-						XCTAssertEqual(elements.events, [])
-					}
-					
-					it("errors observable receives generated errors") {
-						XCTAssertEqual(errors.events, [
-							next(10, .notEnabled),
-							next(20, .notEnabled),
-							])
-					}
-                    
-                    it("underlyingError observable receives zero generated errors") {
-                        XCTAssertEqual(underlyingError.events.count, 0)
-                    }
-					
-					it("disabled") {
-						XCTAssertEqual(enabled.events, [
-							next(0, false),
-							])
-					}
-					
-					it("never be executing") {
-						XCTAssertEqual(executing.events, [
-							next(0, false),
-							])
-					}
-					
-					it("never executes") {
-						expect(executionObservables.events).to(beEmpty())
-					}
-				}
-				
-				var action: Action<String, String>!
-				
-				beforeEach {
-					action = Action(enabledIf: Observable.just(false)) { Observable.just($0) }
-					bindAction(action: action)
-				}
-				
-				context("trigger via inputs subject") {
-					beforeEach {
-						scheduler.scheduleAt(10) { action.inputs.onNext("a") }
-						scheduler.scheduleAt(20) { action.inputs.onNext("b") }
-						scheduler.start()
-					}
-					
-					itBehavesLike("send notEnabled errors to errors observable")
-				}
-				
-				context("trigger via execute() method") {
-					beforeEach {
-						scheduler.scheduleAt(10) { action.execute("a") }
-						scheduler.scheduleAt(20) { action.execute("b") }
-						scheduler.start()
-					}
-					
-					itBehavesLike("send notEnabled errors to errors observable")
-				}
-			}
-		}
-		
-		describe("execute function return value") {
-			var action: Action<String, String>!
-			var element: TestableObserver<String>!
-			var executionObservables: TestableObserver<Observable<String>>!
-			
-			beforeEach {
-				element = scheduler.createObserver(String.self)
-				executionObservables = scheduler.createObserver(Observable<String>.self)
-			}
-			
-			func bindAndExecuteTwice(action: Action<String, String>) {
-				action.executionObservables
-					.bind(to: executionObservables)
-					.disposed(by: disposeBag)
-				
-				scheduler.scheduleAt(10) {
-					action.execute("a")
-						.bind(to: element)
-						.disposed(by: disposeBag)
-				}
-				
-				scheduler.scheduleAt(20) {
-					action.execute("b")
-						.bind(to: element)
-						.disposed(by: disposeBag)
-				}
-				
-				scheduler.start()
-			}
-			
-			context("single element action") {
-				beforeEach {
-					action = Action { Observable.just($0) }
-					bindAndExecuteTwice(action: action)
-				}
-				
-				it("element receives single value for each execution") {
-					XCTAssertEqual(element.events, [
-						next(10, "a"),
-						completed(10),
-						next(20, "b"),
-						completed(20),
-						])
-				}
-				
-				it("executes twice") {
-					expect(executionObservables.events.count) == 2
-				}
-			}
-			
-			context("multiple element action") {
-				beforeEach {
-					action = Action { Observable.of($0, $0, $0) }
-					bindAndExecuteTwice(action: action)
-				}
-				
-				it("element receives 3 values for each execution") {
-					XCTAssertEqual(element.events, [
-						next(10, "a"),
-						next(10, "a"),
-						next(10, "a"),
-						completed(10),
-						next(20, "b"),
-						next(20, "b"),
-						next(20, "b"),
-						completed(20),
-						])
-				}
-				
-				it("executes twice") {
-					expect(executionObservables.events.count) == 2
-				}
-			}
-			
-			context("error action") {
-				beforeEach {
-					action = Action { _ in Observable.error(TestError) }
-					bindAndExecuteTwice(action: action)
-				}
-				
-				it("element fails with underlyingError") {
-					XCTAssertEqual(element.events, [
-						error(10, ActionError.underlyingError(TestError)),
-						error(20, ActionError.underlyingError(TestError)),
-						])
-				}
-				
-				it("executes twice") {
-					expect(executionObservables.events.count) == 2
-				}
-			}
-			
-			context("disabled") {
-				beforeEach {
-					action = Action(enabledIf: Observable.just(false)) { Observable.just($0) }
-					bindAndExecuteTwice(action: action)
-				}
-				
-				it("element fails with notEnabled") {
-					XCTAssertEqual(element.events, [
-						error(10, ActionError.notEnabled),
-						error(20, ActionError.notEnabled),
-						])
-				}
-				
-				it("never executes") {
-					expect(executionObservables.events).to(beEmpty())
-				}
-			}
-			
-			context("execute while executing") {
-				var secondElement: TestableObserver<String>!
-				var trigger: PublishSubject<Void>!
-				
-				beforeEach {
-					secondElement = scheduler.createObserver(String.self)
-					trigger = PublishSubject<Void>()
-					action = Action { Observable.just($0).sample(trigger) }
-					
-					action.executionObservables
-						.bind(to: executionObservables)
-						.disposed(by: disposeBag)
-					
-					scheduler.scheduleAt(10) {
-						action.execute("a")
-							.bind(to: element)
-							.disposed(by: disposeBag)
-					}
-					
-					scheduler.scheduleAt(20) {
-						action.execute("b")
-							.bind(to: secondElement)
-							.disposed(by: disposeBag)
-					}
-					
-					scheduler.scheduleAt(30) {
-						#if swift(>=3.2)
-							trigger.onNext(())
-						#else
-							trigger.onNext()
-						#endif
-					}
-					
-					scheduler.start()
-				}
-				
-				it("first element receives single value") {
-					XCTAssertEqual(element.events, [
-						next(30, "a"),
-						completed(30),
-						])
-				}
-				
-				it("second element fails with notEnabled error") {
-					XCTAssertEqual(secondElement.events, [
-						error(20, ActionError.notEnabled)
-						])
-				}
-				
-				it("executes once") {
-					expect(executionObservables.events.count) == 1
-				}
-			}
-		}
-	}
-}
-
-extension ActionError: Equatable {
-	// Not accurate but convenient for testing.
-	public static func ==(lhs: ActionError, rhs: ActionError) -> Bool {
-		switch (lhs, rhs) {
-		case (.notEnabled, .notEnabled):
-			return true
-		case (.underlyingError, .underlyingError):
-			return true
-		default:
-			return false
-		}
-	}
-}
-
-extension String: Error { }
-let TestError = "Test Error"
diff --git a/Tests/InputSubjectTests.swift b/Tests/InputSubjectTests.swift
deleted file mode 100644
index 69cd1b11..00000000
--- a/Tests/InputSubjectTests.swift
+++ /dev/null
@@ -1,113 +0,0 @@
-import Quick
-import Nimble
-import RxSwift
-import RxTest
-import Action
-
-class InputSubjectTests: QuickSpec {
-    override func spec() {
-        var scheduler: TestScheduler!
-        var disposeBag: DisposeBag!
-
-        beforeEach {
-            scheduler = TestScheduler(initialClock: 0)
-            disposeBag = DisposeBag()
-        }
-
-        describe("Disposable observable") {
-            it("observables can be dispose") {
-                let subject = InputSubject<Int>()
-                let disposable1 = subject.subscribe()
-                let disposable2 = subject.subscribe()
-                expect(subject.hasObservers).to(beTrue())
-                disposable2.dispose()
-                expect(subject.hasObservers).to(beTrue())
-                disposable1.dispose()
-                expect(subject.hasObservers).to(beFalse())
-            }
-
-            it("dispose all observables") {
-                let subject = InputSubject<Int>()
-                _ = subject.subscribe()
-                _ = subject.subscribe()
-                expect(subject.hasObservers).to(beTrue())
-                subject.dispose()
-                expect(subject.hasObservers).to(beFalse())
-                expect(subject.isDisposed).to(beTrue())
-            }
-        }
-
-        describe("emit events") {
-            it("emit .next events") {
-                let subject = InputSubject<Int>()
-                let observer = scheduler.createObserver(Int.self)
-                subject.asObservable()
-                    .bind(to: observer)
-                    .disposed(by: disposeBag)
-                scheduler.scheduleAt(10) { subject.onNext(1) }
-                scheduler.scheduleAt(20) { subject.onNext(2) }
-                scheduler.scheduleAt(30) { subject.onNext(3) }
-                scheduler.start()
-
-                XCTAssertEqual(observer.events, [
-                    next(10, 1),
-                    next(20, 2),
-                    next(30, 3)
-                ])
-            }
-
-            it("ignore .error events") {
-                let subject = InputSubject<Int>()
-                let observer = scheduler.createObserver(Int.self)
-                subject.asObservable()
-                    .bind(to: observer)
-                    .disposed(by: disposeBag)
-                scheduler.scheduleAt(10) { subject.onNext(1) }
-                scheduler.scheduleAt(20) { subject.onError(TestError) }
-                scheduler.scheduleAt(30) { subject.onNext(3) }
-                scheduler.start()
-
-                XCTAssertEqual(observer.events, [
-                    next(10, 1),
-                    next(30, 3)
-                ])
-            }
-
-            it("ignore .completed events") {
-                let subject = InputSubject<Int>()
-                let observer = scheduler.createObserver(Int.self)
-                subject.asObservable()
-                    .bind(to: observer)
-                    .disposed(by: disposeBag)
-                scheduler.scheduleAt(10) { subject.onNext(1) }
-                scheduler.scheduleAt(20) { subject.onCompleted() }
-                scheduler.scheduleAt(30) { subject.onNext(3) }
-                scheduler.start()
-
-                XCTAssertEqual(observer.events, [
-                    next(10, 1),
-                    next(30, 3)
-                ])
-            }
-
-            it("event does not fire on disposed subject") {
-                let subject = InputSubject<Int>()
-                let observer = scheduler.createObserver(Int.self)
-                subject.asObservable()
-                    .bind(to: observer)
-                    .disposed(by: disposeBag)
-                scheduler.scheduleAt(10) { subject.onNext(1) }
-                scheduler.scheduleAt(20) { subject.onNext(2) }
-                scheduler.scheduleAt(30) { subject.dispose() }
-                scheduler.scheduleAt(40) { subject.onNext(4) }
-                scheduler.start()
-
-                XCTAssertEqual(observer.events, [
-                    next(10, 1),
-                    next(20, 2),
-                ])
-            }
-        }
-
-    }
-}
diff --git a/Tests/Nimble+RxTest+Ext.swift b/Tests/Nimble+RxTest+Ext.swift
new file mode 100644
index 00000000..6b65bdb5
--- /dev/null
+++ b/Tests/Nimble+RxTest+Ext.swift
@@ -0,0 +1,98 @@
+import Foundation
+import Quick
+import Nimble
+import RxSwift
+import RxTest
+
+/// `Foundation`
+
+extension Optional {
+    func asString() -> String {
+        guard let s = self else { return "nil" }
+        return String(describing: s)
+    }
+}
+
+/// `RxSwift`
+
+extension Event {
+    var isError: Bool {
+        switch self {
+        case .error: return true
+        default: return false
+        }
+    }
+}
+
+/// Nimble
+
+extension PredicateResult {
+    static var evaluationFailed: PredicateResult {
+        return PredicateResult(status: .doesNotMatch,
+                               message: .fail("failed to evaluate given expression"))
+    }
+    
+    static func isEqual<T: Equatable>(actual: T?, expected: T?) -> PredicateResult {
+        return PredicateResult(bool: actual == expected,
+                               message: .expectedCustomValueTo("get <\(expected.asString())>", actual: "<\(actual.asString())>"))
+    }
+}
+
+public func match<T>(_ expected: T) -> Predicate<T> where T: Equatable {
+    return Predicate { events in
+        
+        guard let source = try events.evaluate() else {
+            return PredicateResult.evaluationFailed
+        }
+        guard source == expected else {
+            return PredicateResult(status: .doesNotMatch,
+                                   message: .expectedCustomValueTo("get <\(expected)> events", actual: "<\(source)> events"))
+        }
+        
+        
+        return PredicateResult(bool: true, message: .fail("matched values and timeline as expected"))
+    }
+}
+
+public func match<T>(_ expected: [Recorded<Event<T>>]) -> Predicate<[Recorded<Event<T>>]> where T: Equatable {
+    return Predicate { events in
+        
+        guard let source = try events.evaluate() else {
+            return PredicateResult.evaluationFailed
+        }
+        guard source.count == expected.count else {
+            return PredicateResult(bool: false,
+                                   message: .expectedCustomValueTo("get <\(expected.count)> events", actual: "<\(source.count)> events"))
+        }
+        
+        for (lhs, rhs) in zip(source, expected) {
+            guard lhs.time == rhs.time,
+                lhs.value == rhs.value else {
+                    return PredicateResult(bool: rhs == lhs,
+                                           message: .expectedCustomValueTo("match <\(rhs)>", actual: "<\(lhs)>"))
+            }
+            continue
+        }
+        
+        return PredicateResult(bool: true, message: .fail("match timeline"))
+    }
+}
+
+public func match<T, E: Error>(with expectedErrors: [Recorded<Event<E>>]) -> Predicate<[Recorded<Event<T>>]> where E: Equatable {
+    return Predicate { events in
+        guard let source = try events.evaluate() else {
+            return PredicateResult.evaluationFailed
+        }
+        let errorEvents = source.filter { $0.value.isError }
+        for (lhs, rhs) in zip(errorEvents, expectedErrors) {
+            guard lhs.time == rhs.time,
+                lhs.value.error.asString() == rhs.value.error.asString() else {
+                return PredicateResult(bool: false,
+                                       message: .fail("did not error"))
+            }
+            continue
+        }
+        
+        return PredicateResult(bool: true, message: .fail("matched values and timeline as expected"))
+    }
+}
diff --git a/Tests/TestEvents.swift b/Tests/TestEvents.swift
new file mode 100644
index 00000000..6ee16c06
--- /dev/null
+++ b/Tests/TestEvents.swift
@@ -0,0 +1,91 @@
+import Foundation
+import RxSwift
+import RxTest
+@testable import Action
+
+enum TestEvents {
+    static let inputs = Recorded.events([
+        .next(10, "a"),
+        .next(20, "b"),
+        ])
+
+    static let elements = Recorded.events([
+        .next(10, "a"),
+        .next(20, "b"),
+        ])
+    
+    static let multipleElements = Recorded.events([
+        .next(10, "a"),
+        .next(10, "b"),
+        .next(10, "c"),
+        .next(20, "b"),
+        .next(20, "c"),
+        .next(20, "d"),
+        ])
+
+    static let enabled =  Recorded.events([
+        .next(0, true),
+        .next(10, false),
+        .next(10, true),
+        .next(20, false),
+        .next(20, true),
+        ])
+
+    static let disabled = Recorded.events([
+        .next(0, true),
+        .next(10, false),
+        .next(10, true),
+        .next(20, false),
+        .next(20, true),
+        ])
+
+    static let executing = Recorded.events([
+        .next(0, false),
+        .next(10, true),
+        .next(10, false),
+        .next(20, true),
+        .next(20, false),
+        ])
+    
+    static let `false` = Recorded.events([
+        .next(0, false),
+        ])
+
+    static let underlyingErrors = Recorded.events([
+        .next(10, ActionError.underlyingError(TestError)),
+        .next(20, ActionError.underlyingError(TestError)),
+        ])
+    
+    static let notEnabledErrors = Recorded.events([
+        .next(10, ActionError.notEnabled),
+        .next(20, ActionError.notEnabled),
+        ])
+    
+    static let executionStreams = Recorded.events([
+        .next(10, "a"),
+        .completed(10),
+        .next(20, "b"),
+        .completed(20),
+        ])
+    
+    static let elementUnderlyingErrors = Recorded.events([
+        .error(10, ActionError.underlyingError(TestError), String.self),
+        .error(20, ActionError.underlyingError(TestError), String.self),
+        ])
+
+    static let elementNotEnabledErrors = Recorded.events([
+        .error(10, ActionError.notEnabled, String.self),
+        .error(20, ActionError.notEnabled, String.self),
+        ])
+    
+    static let multipleExecutionStreams = Recorded.events([
+        .next(10, "a"),
+        .next(10, "a"),
+        .next(10, "a"),
+        .completed(10),
+        .next(20, "b"),
+        .next(20, "b"),
+        .next(20, "b"),
+        .completed(20),
+        ])
+}
diff --git a/Tests/iOS-Tests/AlertActionTests.swift b/Tests/iOS-Tests/AlertActionTests.swift
index 88ef4884..fa8c21dc 100644
--- a/Tests/iOS-Tests/AlertActionTests.swift
+++ b/Tests/iOS-Tests/AlertActionTests.swift
@@ -1,29 +1,22 @@
 import Quick
 import Nimble
 import RxSwift
-import RxBlocking
 import Action
 
 class AlertActionTests: QuickSpec {
     override func spec() {
         it("is nil by default") {
             let subject = UIAlertAction.Action("Hi", style: .default)
-            expect(subject.rx.action).to( beNil() )
+            expect(subject.rx.action).to(beNil())
         }
-
         it("respects setter") {
             var subject = UIAlertAction.Action("Hi", style: .default)
-
             let action = emptyAction()
-
             subject.rx.action = action
-
-            expect(subject.rx.action) === action
+            expect(subject.rx.action).to(beAKindOf(CocoaAction.self))
         }
-
         it("disables the alert action while executing") {
             var subject = UIAlertAction.Action("Hi", style: .default)
-
             var observer: AnyObserver<Void>!
             let action = CocoaAction(workFactory: { _ in
                 return Observable.create { (obsv) -> Disposable in
@@ -33,7 +26,6 @@ class AlertActionTests: QuickSpec {
             })
 
             subject.rx.action = action
-
             action.execute()
             expect(subject.isEnabled).toEventually( beFalse() )
 
@@ -55,19 +47,19 @@ class AlertActionTests: QuickSpec {
                     .disposed(by: disposeBag)
             }
 
-            expect(subject.isEnabled) == false
+            expect(subject.isEnabled).to(beFalse())
         }
-        
+
         it("disposes of old action subscriptions when re-set") {
             var subject = UIAlertAction.Action("Hi", style: .default)
-            
+
             var disposed = false
             autoreleasepool {
                 let disposeBag = DisposeBag()
-                
+
                 let action = emptyAction()
                 subject.rx.action = action
-                
+
                 action
                     .elements
                     .subscribe(onNext: nil, onError: nil, onCompleted: nil, onDisposed: {
@@ -75,10 +67,9 @@ class AlertActionTests: QuickSpec {
                     })
                     .disposed(by: disposeBag)
             }
-            
+
             subject.rx.action = nil
-            
-            expect(disposed) == true
+            expect(disposed).to(beTrue())
         }
     }
 }
diff --git a/Tests/iOS-Tests/BarButtonTests.swift b/Tests/iOS-Tests/BarButtonTests.swift
index 6bb9c679..d1c11231 100644
--- a/Tests/iOS-Tests/BarButtonTests.swift
+++ b/Tests/iOS-Tests/BarButtonTests.swift
@@ -1,30 +1,27 @@
 import Quick
 import Nimble
 import RxSwift
-import RxBlocking
 import Action
 
 class BarButtonTests: QuickSpec {
 	override func spec() {
-		
+
 		it("is nil by default") {
 			let subject = UIBarButtonItem(barButtonSystemItem: .save, target: nil, action: nil)
 			expect(subject.rx.action).to( beNil() )
 		}
-		
+
 		it("respects setter") {
 			var subject = UIBarButtonItem(barButtonSystemItem: .save, target: nil, action: nil)
-			
+
 			let action = emptyAction()
-			
 			subject.rx.action = action
-			
-			expect(subject.rx.action) === action
+            expect(subject.rx.action).to(beAKindOf(CocoaAction.self))
 		}
-		
+
 		it("disables the button while executing") {
 			var subject = UIBarButtonItem(barButtonSystemItem: .save, target: nil, action: nil)
-			
+
 			var observer: AnyObserver<Void>!
 			let action = CocoaAction(workFactory: { _ in
 				return Observable.create { (obsv) -> Disposable in
@@ -32,28 +29,27 @@ class BarButtonTests: QuickSpec {
 					return Disposables.create()
 				}
 			})
-			
+
 			subject.rx.action = action
-			
+
 			action.execute()
 			expect(subject.isEnabled).toEventually( beFalse() )
-			
+
 			observer.onCompleted()
 			expect(subject.isEnabled).toEventually( beTrue() )
 		}
-		
+
 		it("disables the button if the Action is disabled") {
 			var subject = UIBarButtonItem(barButtonSystemItem: .save, target: nil, action: nil)
-			
+
 			subject.rx.action = emptyAction(.just(false))
-            expect(subject.target).toEventuallyNot( beNil() )
-			
-			expect(subject.isEnabled) == false
+            expect(subject.target).toEventuallyNot(beNil())
+			expect(subject.isEnabled).to(beFalse())
 		}
-		
+
 		it("doesn't execute a disabled action when tapped") {
 			var subject = UIBarButtonItem(barButtonSystemItem: .save, target: nil, action: nil)
-			
+
 			var executed = false
 			subject.rx.action = CocoaAction(enabledIf: .just(false), workFactory: { _ in
 				executed = true
@@ -61,13 +57,12 @@ class BarButtonTests: QuickSpec {
 			})
 
 			_ = subject.target?.perform(subject.action, with: subject)
-			
 			expect(executed) == false
 		}
-		
+
 		it("executes the action when tapped") {
 			var subject = UIBarButtonItem(barButtonSystemItem: .save, target: nil, action: nil)
-			
+
 			var executed = false
 			let action = CocoaAction(workFactory: { _ in
 				executed = true
@@ -75,23 +70,21 @@ class BarButtonTests: QuickSpec {
 			})
 			subject.rx.action = action
             // Setting the action has the asynchronous effect of adding a target.
-            expect(subject.target).toEventuallyNot( beNil() )
-
+            expect(subject.target).toEventuallyNot(beNil())
 			_ = subject.target?.perform(subject.action, with: subject)
-			
-			expect(executed) == true
+			expect(executed).to(beTrue())
 		}
-		
+
 		it("disposes of old action subscriptions when re-set") {
 			var subject = UIBarButtonItem(barButtonSystemItem: .save, target: nil, action: nil)
-			
+
 			var disposed = false
 			autoreleasepool {
 				let disposeBag = DisposeBag()
-				
+
 				let action = emptyAction()
 				subject.rx.action = action
-				
+
 				action
 					.elements
 					.subscribe(onNext: nil, onError: nil, onCompleted: nil, onDisposed: {
@@ -99,10 +92,9 @@ class BarButtonTests: QuickSpec {
 					})
 					.disposed(by: disposeBag)
 			}
-			
+
 			subject.rx.action = nil
-			
-			expect(disposed) == true
+			expect(disposed).to(beTrue())
 		}
 	}
 }
diff --git a/Tests/iOS-Tests/BindToTests.swift b/Tests/iOS-Tests/BindToTests.swift
index 552be95c..c7e11278 100644
--- a/Tests/iOS-Tests/BindToTests.swift
+++ b/Tests/iOS-Tests/BindToTests.swift
@@ -2,7 +2,6 @@ import Quick
 import Nimble
 import RxSwift
 import RxCocoa
-import RxBlocking
 import RxTest
 import Action
 
@@ -40,12 +39,25 @@ class BindToTests: QuickSpec {
 			button.rx.bind(to: action, input: "Hi there!")
 			// Setting the action has an asynchronous effect of adding a target.
 			expect(button.allTargets.count) == 1
-			
+
 			button.test_executeTap()
-			
+
 			expect(called).toEventually( beTrue() )
 		}
-		
+
+		it("does not retain UIButton") {
+			var button: UIButton? = UIButton()
+			let action = Action<String, String>(workFactory: { _ in
+				return .empty()
+			})
+			button?.rx.bind(to: action, input: "Hi there!")
+
+			weak var buttonWeakReference = button
+			button = nil
+
+			expect(buttonWeakReference).to(beNil())
+		}
+
 		it("activates a generic control event") {
 			var called = false
 			let button = UIButton()
@@ -56,12 +68,12 @@ class BindToTests: QuickSpec {
 			button.rx.bind(to: action, controlEvent: button.rx.tap, inputTransform: { input in "\(input)" })
 			// Setting the action has an asynchronous effect of adding a target.
 			expect(button.allTargets.count) == 1
-			
+
 			button.test_executeTap()
-			
+
 			expect(called).toEventually( beTrue() )
 		}
-		
+
 		it("actives a UIBarButtonItem") {
 			var called = false
 			let item = UIBarButtonItem()
@@ -70,11 +82,25 @@ class BindToTests: QuickSpec {
 				return .empty()
 			})
 			item.rx.bind(to: action, input: "Hi there!")
-			
+
 			_ = item.target!.perform(item.action!, with: item)
-			
+
 			expect(called).toEventually( beTrue() )
 		}
+
+        it("does not retain UIBarButtonItem") {
+          var barButtonItem: UIBarButtonItem? = UIBarButtonItem(barButtonSystemItem: .save, target: nil, action: nil)
+          let action = Action<String, String>(workFactory: { _ in
+              return .empty()
+          })
+          barButtonItem?.rx.bind(to: action, input: "Hi there!")
+
+          weak var barButtonItemWeakReference = barButtonItem
+          barButtonItem = nil
+
+          expect(barButtonItemWeakReference).to(beNil())
+        }
+
         it("actives a UIRefreshControl") {
             var called = false
             let item = UIRefreshControl()
@@ -83,12 +109,25 @@ class BindToTests: QuickSpec {
                 return .empty()
             })
             item.rx.bind(to: action, input: "Hi there!")
-            
+
             item.test_executeRefresh()
-            
+
             expect(called).toEventually( beTrue() )
         }
-		
+
+        it("does not retain UIRefreshControl") {
+          var refreshControl: UIRefreshControl? = UIRefreshControl()
+          let action = Action<String, String>(workFactory: { _ in
+              return .empty()
+          })
+          refreshControl?.rx.bind(to: action, input: "Hi there!")
+
+          weak var refreshControlWeakReference = refreshControl
+          refreshControl = nil
+
+          expect(refreshControlWeakReference).to(beNil())
+        }
+
 		describe("unbinding") {
 			it("unbinds actions for UIButton") {
 				let button = UIButton()
@@ -99,13 +138,13 @@ class BindToTests: QuickSpec {
 				button.rx.bind(to: action, input: "Hi there!")
 				// Setting the action has an asynchronous effect of adding a target.
 				expect(button.allTargets.count) == 1
-				
+
 				button.rx.unbindAction()
 				button.test_executeTap()
-				
+
 				expect(button.allTargets.count) == 0
 			}
-            
+
             it("unbinds actions for UIRefreshControl") {
                 let refreshControl = UIRefreshControl()
                 let action = Action<String, String>(workFactory: { _ in
@@ -115,13 +154,13 @@ class BindToTests: QuickSpec {
                 refreshControl.rx.bind(to: action, input: "Hi there!")
                 // Setting the action has an asynchronous effect of adding a target.
                 expect(refreshControl.allTargets.count) == 1
-                
+
                 refreshControl.rx.unbindAction()
                 refreshControl.test_executeRefresh()
-                
+
                 expect(refreshControl.allTargets.count) == 0
             }
-			
+
 			it("unbinds actions for UIBarButtonItem") {
 				var called = false
 				let item = UIBarButtonItem()
@@ -130,13 +169,12 @@ class BindToTests: QuickSpec {
 					return .empty()
 				})
 				item.rx.bind(to: action, input: "Hi there!")
-				
+
 				item.rx.unbindAction()
 				_ = item.target?.perform(item.action!, with: item)
-				
+
 				expect(called).to( beFalse() )
 			}
 		}
 	}
 }
-
diff --git a/Tests/iOS-Tests/ButtonTests.swift b/Tests/iOS-Tests/ButtonTests.swift
index feeddcee..6eab9abf 100644
--- a/Tests/iOS-Tests/ButtonTests.swift
+++ b/Tests/iOS-Tests/ButtonTests.swift
@@ -1,7 +1,6 @@
 import Quick
 import Nimble
 import RxSwift
-import RxBlocking
 import Action
 
 class ButtonTests: QuickSpec {
@@ -104,9 +103,9 @@ class ButtonTests: QuickSpec {
 
             expect(disposed) == true
         }
-        
+
         it("cancels the observable if the button is deallocated") {
-            
+
             var disposed = false
 
             waitUntil { done in
@@ -125,7 +124,7 @@ class ButtonTests: QuickSpec {
                     subject.rx.action?.execute()
                 }
             }
-            
+
             expect(disposed) == true
         }
     }
diff --git a/Tests/iOS-Tests/RefreshControlTests.swift b/Tests/iOS-Tests/RefreshControlTests.swift
index 18390056..996f43fd 100644
--- a/Tests/iOS-Tests/RefreshControlTests.swift
+++ b/Tests/iOS-Tests/RefreshControlTests.swift
@@ -1,7 +1,6 @@
 import Quick
 import Nimble
 import RxSwift
-import RxBlocking
 import Action
 
 class RefreshControlTests: QuickSpec {
@@ -47,7 +46,7 @@ class RefreshControlTests: QuickSpec {
 
             subject.rx.action = emptyAction(.just(false))
             expect(subject.allTargets.count) == 1
-            
+
             expect(subject.isEnabled) == false
         }
 
@@ -77,9 +76,9 @@ class RefreshControlTests: QuickSpec {
 
             // Setting the action has an asynchronous effect of adding a target.
             expect(subject.allTargets.count) == 1
-            
+
             subject.test_executeRefresh()
-            
+
             expect(executed).toEventually( beTrue() )
         }
 
@@ -105,17 +104,17 @@ class RefreshControlTests: QuickSpec {
 
             expect(disposed) == true
         }
-        
+
         it("disposes of old action subscriptions when re-set") {
             var subject = UIBarButtonItem(barButtonSystemItem: .save, target: nil, action: nil)
-            
+
             var disposed = false
             autoreleasepool {
                 let disposeBag = DisposeBag()
-                
+
                 let action = emptyAction()
                 subject.rx.action = action
-                
+
                 action
                     .elements
                     .subscribe(onNext: nil, onError: nil, onCompleted: nil, onDisposed: {
@@ -123,11 +122,10 @@ class RefreshControlTests: QuickSpec {
                     })
                     .disposed(by: disposeBag)
             }
-            
+
             subject.rx.action = nil
-            
+
             expect(disposed) == true
         }
     }
 }
-
diff --git a/Tests/macOS-Tests/BindToTests.swift b/Tests/macOS-Tests/BindToTests.swift
index 37ecc910..b12135f7 100644
--- a/Tests/macOS-Tests/BindToTests.swift
+++ b/Tests/macOS-Tests/BindToTests.swift
@@ -26,12 +26,12 @@ class BindToTests: QuickSpec {
 			button.rx.bind(to: action, input: "Hi there!")
 			// Setting the action has an asynchronous effect of adding a target.
 			expect(button.target).toEventuallyNot( beNil() )
-			
+
 			button.test_executeAction()
-			
+
 			expect(called).toEventually( beTrue() )
 		}
-		
+
 		it("activates a generic control event") {
 			var called = false
 			let button = NSButton()
@@ -42,13 +42,12 @@ class BindToTests: QuickSpec {
 			button.rx.bind(to: action, controlEvent: button.rx.tap, inputTransform: { input in "\(input)" })
 			// Setting the action has an asynchronous effect of adding a target.
 			expect(button.target).toEventuallyNot( beNil() )
-			
+
 			button.test_executeAction()
-			
+
 			expect(called).toEventually( beTrue() )
 		}
-		
-		
+
 		describe("unbinding") {
 			it("unbinds actions for UIButton") {
 				let button = NSButton()
@@ -59,13 +58,12 @@ class BindToTests: QuickSpec {
 				button.rx.bind(to: action, input: "Hi there!")
 				// Setting the action has an asynchronous effect of adding a target.
 				expect(button.target).toEventuallyNot( beNil() )
-				
+
 				button.rx.unbindAction()
 				button.test_executeAction()
-				
+
 				expect(button.target).toEventually( beNil() )
 			}
 		}
 	}
 }
-
diff --git a/Tests/macOS-Tests/NSButtonTests.swift b/Tests/macOS-Tests/NSButtonTests.swift
index 1c626430..b6abbe8f 100644
--- a/Tests/macOS-Tests/NSButtonTests.swift
+++ b/Tests/macOS-Tests/NSButtonTests.swift
@@ -7,25 +7,25 @@ import Action
 
 class NSButtonTests: QuickSpec {
 	override func spec() {
-		
+
 		it("is nil by default") {
 			let subject = NSButton()
 			expect(subject.rx.action).to( beNil() )
 		}
-		
+
 		it("respects setter") {
 			var subject = NSButton()
-			
+
 			let action = emptyAction()
-			
+
 			subject.rx.action = action
-			
+
 			expect(subject.rx.action) === action
 		}
-		
+
 		it("disables the button while executing") {
 			var subject = NSButton()
-			
+
 			var observer: AnyObserver<Void>!
 			let action = CocoaAction(workFactory: { _ in
 				return Observable.create { (obsv) -> Disposable in
@@ -33,66 +33,66 @@ class NSButtonTests: QuickSpec {
 					return Disposables.create()
 				}
 			})
-			
+
 			subject.rx.action = action
-			
+
 			action.execute(())
 			expect(subject.isEnabled).toEventually( beFalse() )
-			
+
 			observer.onCompleted()
 			expect(subject.isEnabled).toEventually( beTrue() )
 		}
-		
+
 		it("disables the button if the Action is disabled") {
 			var subject = NSButton()
 			subject.rx.action = emptyAction(.just(false))
 			expect(subject.target).toEventuallyNot( beNil() )
-			
+
 			expect(subject.isEnabled) == false
 		}
-		
+
 		it("doesn't execute a disabled action when tapped") {
 			var subject = NSButton()
-			
+
 			var executed = false
 			subject.rx.action = CocoaAction(enabledIf: .just(false), workFactory: { _ in
 				executed = true
 				return .empty()
 			})
-			
+
 			subject.sendAction(on: .leftMouseDown)
-			
+
 			expect(executed) == false
 		}
-		
+
 		it("executes the action when tapped") {
 			var subject = NSButton()
-			
+
 			var executed = false
 			let action = CocoaAction(workFactory: { _ in
 				executed = true
 				return .empty()
 			})
 			subject.rx.action = action
-			
+
 			// Setting the action has an asynchronous effect of adding a target.
 			expect(subject.target).toEventuallyNot( beNil() )
-			
+
 			subject.test_executeAction()
-			
+
 			expect(executed).toEventually( beTrue() )
 		}
-		
+
 		it("disposes of old action subscriptions when re-set") {
 			var subject = NSButton()
-			
+
 			var disposed = false
 			autoreleasepool {
 				let disposeBag = DisposeBag()
-				
+
 				let action = emptyAction()
 				subject.rx.action = action
-				
+
 				action
 					.elements
 					.subscribe(onNext: nil, onError: nil, onCompleted: nil, onDisposed: {
@@ -100,16 +100,16 @@ class NSButtonTests: QuickSpec {
 					})
 					.disposed(by: disposeBag)
 			}
-			
+
 			subject.rx.action = nil
-			
+
 			expect(disposed) == true
 		}
-		
+
 		it("cancels the observable if the button is deallocated") {
-			
+
 			var disposed = false
-			
+
 			waitUntil { done in
 				autoreleasepool {
 					var subject = NSButton()
@@ -121,7 +121,7 @@ class NSButtonTests: QuickSpec {
 							}
 						}
 					}
-					
+
 					subject.rx.action = action
 					#if swift(>=3.2)
 					subject.rx.action?.execute(())
@@ -130,7 +130,7 @@ class NSButtonTests: QuickSpec {
 					#endif
 				}
 			}
-			
+
 			expect(disposed) == true
 		}
 	}
@@ -141,4 +141,3 @@ func emptyAction(_ enabledIf: Observable<Bool> = .just(true)) -> CocoaAction {
 		return .empty()
 	})
 }
-
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 90a9b007..00000000
--- a/circle.yml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-version: 2
-jobs:
-  "Action Tests":
-    working_directory: ~/RxSwiftCommunity/Action
-    parallelism: 1
-    shell: /bin/bash --login
-    environment:
-      XCODE_TEST_REPORTS: /tmp/xcode-test-results
-      LANG: en_US.UTF-8
-    macos:
-      xcode: '10.2.0'
-    steps:
-      - checkout
-      - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS $XCODE_TEST_REPORTS
-      - restore_cache:
-          keys:
-            - v1-dep-{{ .Branch }}-
-            - v1-dep-master-
-            - v1-dep-
-      - run:
-          name: Bootstrap Carthage
-          command: carthage update --no-use-binaries
-      - save_cache:
-          key: v1-dep-{{ .Branch }}-{{ epoch }}
-          paths:
-            - Carthage
-      - run:
-          name: Run Tests (Swift 5.0)
-          command: >
-                   set -o pipefail && xcodebuild test SWIFT_VERSION=5.0
-                   -workspace Action.xcworkspace
-                   -scheme 'Action' -sdk iphonesimulator
-                   -destination "name=iPhone X" | xcpretty -c --test
-      - run:
-          name: Run Tests (Swift 4.2)
-          command: >
-                   set -o pipefail && xcodebuild test SWIFT_VERSION=4.2
-                   -workspace Action.xcworkspace
-                   -scheme 'Action' -sdk iphonesimulator
-                   -destination "name=iPhone X" | xcpretty -c --test
-      - run:
-          name: Build  watchOS (Swift 5.0)
-          command: >
-                   set -o pipefail && xcodebuild build SWIFT_VERSION=5.0
-                   -workspace Action.xcworkspace
-                   -scheme Action-watchOS -sdk watchsimulator
-                   -destination "name=Apple Watch Series 2 - 42mm" | xcpretty -c
-      - run:
-          name: Build  watchOS (Swift 4.2)
-          command: >
-                   set -o pipefail && xcodebuild build SWIFT_VERSION=4.2
-                   -workspace Action.xcworkspace
-                   -scheme Action-watchOS -sdk watchsimulator
-                   -destination "name=Apple Watch Series 2 - 42mm" | xcpretty -c
-      - run:
-          name: Build  macOS (Swift 5.0)
-          command: >
-                   set -o pipefail && xcodebuild build SWIFT_VERSION=5.0
-                   -workspace Action.xcworkspace
-                   -scheme Action-macOS -sdk macosx
-                   -destination "arch=x86_64" | xcpretty -c
-      - run:
-          name: Build  macOS (Swift 4.2)
-          command: >
-                   set -o pipefail && xcodebuild build SWIFT_VERSION=4.2
-                   -workspace Action.xcworkspace
-                   -scheme Action-macOS -sdk macosx
-                   -destination "arch=x86_64" | xcpretty -c
-      - run:
-          name: Build  tvOS (Swift 5.0)
-          command: >
-                   set -o pipefail && xcodebuild build SWIFT_VERSION=5.0
-                   -workspace Action.xcworkspace
-                   -scheme Action-tvOS -sdk appletvsimulator
-                   -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c
-      - run:
-          name: Build  tvOS (Swift 4.2)
-          command: >
-                   set -o pipefail && xcodebuild build SWIFT_VERSION=4.2
-                   -workspace Action.xcworkspace
-                   -scheme Action-tvOS -sdk appletvsimulator
-                   -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c
-      - store_artifacts:
-          path: /tmp/xcode-test-results
-workflows:
-  version: 2
-  build:
-    jobs:
-      - "Action Tests":
-          filters:
-            tags:
-              ignore: /[0-9]+(\.[0-9]+)*/
\ No newline at end of file