Index: pyyaml/trunk/tests/test_errors.py
===================================================================
--- pyyaml/trunk/tests/test_errors.py	(revision 59)
+++ pyyaml/trunk/tests/test_errors.py	(revision 136)
@@ -16,11 +16,5 @@
     def _load(self, filename):
         try:
-            reader = Reader(file(filename, 'rb'))
-            scanner = Scanner(reader)
-            parser = Parser(scanner)
-            composer = Composer(parser)
-            resolver = Resolver(composer)
-            constructor = Constructor(resolver)
-            return list(constructor)
+            return list(load_all(file(filename, 'rb')))
         except YAMLError, exc:
         #except ScannerError, exc:
@@ -34,11 +28,5 @@
     def _load_string(self, filename):
         try:
-            reader = Reader(file(filename, 'rb').read())
-            scanner = Scanner(reader)
-            parser = Parser(scanner)
-            composer = Composer(parser)
-            resolver = Resolver(composer)
-            constructor = Constructor(resolver)
-            return list(constructor)
+            return list(load_all(file(filename, 'rb').read()))
         except YAMLError, exc:
         #except ScannerError, exc: