 	
 	private func initializeStoreAtURL(storeURL: NSURL) throws {
 		let initialPersistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: models.first!)
-		let _ = try initialPersistentStoreCoordinator.addPersistentStoreWithType(storeType, configuration: nil, URL: storeURL, options: nil)
+		try initialPersistentStoreCoordinator.addPersistentStoreWithType(storeType, configuration: nil, URL: storeURL, options: nil)
 	}
     
-    func testManualStoreMigration() throws {
+    func testManualStoreMigration() {
 		let storeURL = workingDirectoryURL.URLByAppendingPathComponent("Manually Migrated Store", isDirectory: false)
 		do {
 			try initializeStoreAtURL(storeURL)
-		} catch let error as NSError {
+		} catch {
 			XCTFail("Could not initialize persistent store: \(error)")
-			throw error
+			return
 		}
 		
 		for newerModel in models[1..<models.endIndex] {
 			let existingStoreMetadata: [String: AnyObject]
 			do {
 				existingStoreMetadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(storeType, URL: storeURL)
-			} catch let error as NSError {
+			} catch {
 				XCTFail("Could not retrieve store metadata: \(error)")
-				throw error
+				return
 			}
 			let existingStoreVersionHashes = existingStoreMetadata[NSStoreModelVersionHashesKey] as! [NSObject: AnyObject]!
 			XCTAssertNotNil(existingStoreVersionHashes, "Could not retrieve version hashes from \(storeURL).")

		
		let persistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: latestModel)
		do {
			let _ = try persistentStoreCoordinator.addPersistentStoreWithType(storeType, configuration: nil, URL: storeURL, options: nil)
		} catch let error as NSError {
			XCTFail("Could not load persistent store after migration: \(error)")
			throw error
		}
	}
}

		if let workingDirectoryURL = workingDirectoryURL {
			do {
				try NSFileManager.defaultManager().removeItemAtURL(workingDirectoryURL)
			} catch {
				XCTFail("Could not remove working directory: \(error)")
			}
		}
