diff --git a/SwiftShellTests/Stream_Iteration_Tests.swift b/SwiftShellTests/Stream_Iteration_Tests.swift
index 7f81ea1..b48af8c 100644
--- a/SwiftShellTests/Stream_Iteration_Tests.swift
+++ b/SwiftShellTests/Stream_Iteration_Tests.swift
@@ -10,58 +10,30 @@ import XCTest
 import SwiftShell
 
 class Stream_Iteration_Tests: XCTestCase {
-
+	
 	func testIterateOverFileHandle() {
 		var filehandletest = ""
 		
 		for line in stream("line 1\nline 2\n").lines() {
 			filehandletest += line + "\n"
 		}
-		XCTAssert(filehandletest == "line 1\nline 2\n")
-		// TODO: replace XCT assert with XCT assert equal
+		XCTAssertEqual(filehandletest , "line 1\nline 2\n")
+		
 		XCTAssertEqual(["line 1","line 2"] , Array(stream("line 1\nline 2").lines()))
-		XCTAssert(["line 1"] == Array(stream("line 1\n").lines()))
-		XCTAssert(["line 1"] == Array(stream("line 1").lines()))
-		XCTAssert(["line 1","", "line 3"] == Array(stream("line 1\n\nline 3").lines()))
-		XCTAssert(["","line 2", "line 3"] == Array(stream("\nline 2\nline 3").lines()))
-		XCTAssert(["","", "line 3"] == Array(stream("\n\nline 3").lines()))
+		XCTAssertEqual(["line 1"] , Array(stream("line 1\n").lines()))
+		XCTAssertEqual(["line 1"] , Array(stream("line 1").lines()))
+		XCTAssertEqual(["line 1", "", "line 3"] , Array(stream("line 1\n\nline 3").lines()))
+		XCTAssertEqual(["", "line 2", "line 3"] , Array(stream("\nline 2\nline 3").lines()))
+		XCTAssertEqual(["", "", "line 3"] , Array(stream("\n\nline 3").lines()))
 	}
 	
 	func testIterateOverStreamInPieces () {
-		XCTAssert(["line 1","line 2"] == Array(stream(["line"," 1\nline 2"]).lines()))
-		XCTAssert(["line 1"] == Array(stream(["line 1","\n"]).lines()))
-		XCTAssert(["line 1"] == Array(stream(["li","ne"," 1"]).lines()))
-		XCTAssert(["line 1","", "line 3"] == Array(stream(["line 1\n","\n","line 3"]).lines()))
-		XCTAssert(["","line 2", "line 3"] == Array(stream(["\nline 2\n","line 3"]).lines()))
-		XCTAssert(["","", "line 3"] == Array(stream(["\n","\nli","ne 3"]).lines()))		
-	}
-
-	// FIXME: crashes with "incorrect checksum for freed object - object was probably modified after being freed." (beta 6)
-	func notestReadingLinesFromShellCommand () {
-		for line in SwiftShell.run("ls -R ~/Library").lines() {
-			println(line)
-		}
-	}
-
-	// same input as above, works fine
-	func notestReadingLinesFromLongFile () {
-		var numberoflines = 0
-		for line in SwiftShell.open("/Users/karemorstol/Data/Programmering/Shell.Swift/Shell.Swift/Shell.SwiftTests/Scripts/longtext.txt").lines() {
-			 numberoflines++
-		}
-		XCTAssertEqual(numberoflines, 641810)
-	}
-
-	// same input as above, works fine
-	func notestReadingFromShellCommand () {
-		let file = SwiftShell.run("ls -R ~/Library") as ReadableStreamType
-		var some = file.readSome()
-		var i = 1
-		while (some != nil) {
-			some = file.readSome()
-			i++
-		}
-		println( "readSome was called \(i) times")// readSome was called 6559 times
-
+		XCTAssertEqual(["line 1","line 2"] , Array(stream(["line"," 1\nline 2"]).lines()))
+		XCTAssertEqual(["line 1"] , Array(stream(["line 1","\n"]).lines()))
+		XCTAssertEqual(["line 1"] , Array(stream(["li","ne"," 1"]).lines()))
+		XCTAssertEqual(["line 1", "", "line 3"] , Array(stream(["line 1\n","\n","line 3"]).lines()))
+		XCTAssertEqual(["", "line 2", "line 3"] , Array(stream(["\nline 2\n","line 3"]).lines()))
+		XCTAssertEqual(["", "", "line 3"] , Array(stream(["\n","\nli","ne 3"]).lines()))		
 	}
+	
 }