 	
 	func testThatItDeletes() {
 		
-		// Note: will insert records into org
-		
-		let type = "Account"
 		let fields = [ "Name" : "Worldwide Stuff, Inc.", "BillingPostalCode": "44554"]
-		let exp = expectation(description: "Delete \(type) record")
+		let exp = expectation(description: "Delete Account record")
 		
 		first {
 			// Insert it
-			salesforce.insert(type: type, fields: fields)
+			salesforce.insert(type: "Account", fields: fields)
 		}.then {
 			// Delete it
 			(id: String) -> Promise<String> in
-			return self.salesforce.delete(type: type, id: id).then { id }
+			return self.salesforce.delete(type: "Account", id: id).then { id }
 		}.then {
 			// Try to query it
 			(id: String) -> Promise<QueryResult<SObject>> in
-			return self.salesforce.query(soql: "SELECT Id FROM \(type) WHERE Id = '\(id)'")
+			return self.salesforce.query(soql: "SELECT Id FROM Account WHERE Id = '\(id)'")
 		}.then {
 			// Then shoudn't be found
 			(queryResult: QueryResult) -> Void in
 			XCTAssert(queryResult.totalSize == 0)
 			exp.fulfill()
 		}.catch {
-			error in
-			XCTFail(String(describing: error))
+			XCTFail(String(describing: $0))
 		}
 		
 		waitForExpectations(timeout: 5.0, handler: nil)

		let type = "Account"
		let exp = expectation(description: "Describe Account")
		
		salesforce.describe(type: type)
			.then {
				(desc: ObjectMetadata) -> () in
				let fields = Dictionary(items: desc.fields!) { $0.name }
				XCTAssertEqual(desc.name, "Account")
				XCTAssertTrue(fields.count > 0)
				XCTAssertNotNil(fields["Type"])
				XCTAssertEqual(fields["Type"]!.type, "picklist")
				exp.fulfill()
			}.catch {
				error in
				XCTFail(String(describing: error))
		}
		waitForExpectations(timeout: 5.0, handler: nil)
	}

				}
				exp.fulfill()
			}.catch {
				XCTFail(String(describing: $0))
		}
		waitForExpectations(timeout: 5.0, handler: nil)
	}
