Fix compile issues

Author: mxcl

Tests/Core/ThenableTests.swift

@@ -84,8 +84,11 @@ class ThenableTests: XCTestCase {
         enum E: Error { case dummy }
 
         let ex = expectation(description: "")
-        Promise(error: E.dummy).compactMap {
-            Int($0)
+
+        let p = Promise<Int>(error: E.dummy)
+
+        p.compactMap { (x: Int) -> Int? in
+            Int(x)
         }.catch {
             if case E.dummy = $0 {} else {
                 XCTFail()

Tests/PMKFoundation/TestNSURLSession.swift

@@ -1,4 +1,4 @@
-#if !os(Linux)
+#if !os(Linux) && !os(watchOS)
 
 import OHHTTPStubsSwift
 import PMKFoundation