Minor test file cleanup