     
   }
 
-  func testW3WQueryUrlWithLatLng() {
+  func testW3WQueryUrlWithLatLng() throws {
     let geocoder = SGAppleGeocoder()
     let url = URL(string: "tripgo:///go?tlat=-33.94501&tlng=151.25807&type=1&time=1385535734")!
     
-    guard let w = try? TKShareHelper.queryDetails(for: url, using: geocoder).toBlocking().first(), let result = w else { XCTFail(); return }
+    guard let result = try TKShareHelper.queryDetails(for: url, using: geocoder).toBlocking().first() else { XCTFail(); return }
     
     XCTAssertNil(result.start)
     XCTAssertTrue(result.end.isValid)

    }
  }()
  
  func testQueryUrlWithW3W() {
    guard let geocoder = geocoder else {
      XCTFail("Could not construct SGBuzzGeocoder. Check environment variables.")
      return


    let url = URL(string: "tripgo:///go?tname=dragon.letter.spoke")!
    
    guard let result = try TKShareHelper.queryDetails(for: url, using: geocoder).toBlocking().first() else { XCTFail(); return }
    
    XCTAssertNil(result.start)
    XCTAssertTrue(result.end.isValid)
