2 files changed, 14 insertions, 55 deletions
diff --git a/tests/core/encoding/hxa/test_core_hxa.odin b/tests/core/encoding/hxa/test_core_hxa.odin
index 7f495e161..17b3ca619 100644
--- a/tests/core/encoding/hxa/test_core_hxa.odin
+++ b/tests/core/encoding/hxa/test_core_hxa.odin
@@ -1,6 +1,3 @@
-// Tests "core:encoding:hxa".
-// Must be run with `-collection:tests=` flag, e.g.
-// ./odin run tests/core/encoding/hxa/test_core_hxa.odin -out=tests/core/test_core_hxa -collection:tests=./tests
 package test_core_hxa
 
 import "core:encoding/hxa"
diff --git a/tests/core/io/test_core_io.odin b/tests/core/io/test_core_io.odin
index 10c9550cb..eb4d79317 100644
--- a/tests/core/io/test_core_io.odin
+++ b/tests/core/io/test_core_io.odin
@@ -1,13 +1,12 @@
 package test_core_io
 
-import "core:bufio"
-import "core:bytes"
-import "core:io"
-import "core:log"
-import "core:os"
-import "core:os/os2"
-import "core:strings"
-import "core:testing"
+import    "core:bufio"
+import    "core:bytes"
+import    "core:io"
+import    "core:log"
+import os "core:os/os2"
+import    "core:strings"
+import    "core:testing"
 
 Passed_Tests :: distinct io.Stream_Mode_Set
 
@@ -540,46 +539,9 @@ test_string_builder_stream :: proc(t: ^testing.T) {
 }
 
 @test
-test_os_file_stream :: proc(t: ^testing.T) {
-	defer if !testing.failed(t) {
-		testing.expect_value(t, os.remove(TEMPORARY_FILENAME), nil)
-	}
-
-	buf: [32]u8
-	for i in 0..<u8(len(buf)) {
-		buf[i] = 'A' + i
-	}
-
-	TEMPORARY_FILENAME :: "test_core_io_os_file_stream"
-
-	fd, open_err := os.open(TEMPORARY_FILENAME, os.O_RDWR | os.O_CREATE | os.O_TRUNC, 0o644)
-	if !testing.expectf(t, open_err == nil, "error on opening %q: %v", TEMPORARY_FILENAME, open_err) {
-		return
-	}
-	
-	stream := os.stream_from_handle(fd)
-
-	bytes_written, write_err := io.write(stream, buf[:])
-	if !testing.expectf(t, bytes_written == len(buf) && write_err == nil,
-		"failed to Write initial buffer: bytes_written<%v> != len_buf<%v>, %v", bytes_written, len(buf), write_err) {
-		return
-	}
-
-	flush_err := io.flush(stream)
-	if !testing.expectf(t, flush_err == nil,
-		"failed to Flush initial buffer: %v", write_err) {
-		return
-	}
-
-	results, _ := _test_stream(t, stream, buf[:])
-
-	log.debugf("%#v", results)
-}
-
-@test
 test_os2_file_stream :: proc(t: ^testing.T) {
 	defer if !testing.failed(t) {
-		testing.expect_value(t, os2.remove(TEMPORARY_FILENAME), nil)
+		testing.expect_value(t, os.remove(TEMPORARY_FILENAME), nil)
 	}
 
 	buf: [32]u8
@@ -589,12 +551,12 @@ test_os2_file_stream :: proc(t: ^testing.T) {
 
 	TEMPORARY_FILENAME :: "test_core_io_os2_file_stream"
 
-	fd, open_err := os2.open(TEMPORARY_FILENAME, {.Read, .Write, .Create, .Trunc})
+	fd, open_err := os.open(TEMPORARY_FILENAME, {.Read, .Write, .Create, .Trunc})
 	if !testing.expectf(t, open_err == nil, "error on opening %q: %v", TEMPORARY_FILENAME, open_err) {
 		return
 	}
 
-	stream := os2.to_stream(fd)
+	stream := os.to_stream(fd)
 
 	bytes_written, write_err := io.write(stream, buf[:])
 	if !testing.expectf(t, bytes_written == len(buf) && write_err == nil,
@@ -679,7 +641,7 @@ test_bufio_buffered_read_writer :: proc(t: ^testing.T) {
 	// Using an os2.File as the backing stream for both reader & writer.
 
 	defer if !testing.failed(t) {
-		testing.expect_value(t, os2.remove(TEMPORARY_FILENAME), nil)
+		testing.expect_value(t, os.remove(TEMPORARY_FILENAME), nil)
 	}
 
 	buf: [32]u8
@@ -689,13 +651,13 @@ test_bufio_buffered_read_writer :: proc(t: ^testing.T) {
 
 	TEMPORARY_FILENAME :: "test_core_io_bufio_read_writer_os2_file_stream"
 
-	fd, open_err := os2.open(TEMPORARY_FILENAME, {.Read, .Write, .Create, .Trunc})
+	fd, open_err := os.open(TEMPORARY_FILENAME, {.Read, .Write, .Create, .Trunc})
 	if !testing.expectf(t, open_err == nil, "error on opening %q: %v", TEMPORARY_FILENAME, open_err) {
 		return
 	}
-	defer testing.expect_value(t, os2.close(fd), nil)
+	defer testing.expect_value(t, os.close(fd), nil)
 
-	stream := os2.to_stream(fd)
+	stream := os.to_stream(fd)
 
 	bytes_written, write_err := io.write(stream, buf[:])
 	if !testing.expectf(t, bytes_written == len(buf) && write_err == nil,