--- a/tests/test_sources_base.py	Tue Oct 17 01:04:10 2017 -0700
+++ b/tests/test_sources_base.py	Tue Oct 17 01:07:30 2017 -0700
@@ -1,26 +1,24 @@
 import os
 import pytest
 from piecrust.app import PieCrust
-from piecrust.sources.pageref import PageRef, PageNotFoundError
 from .mockutil import mock_fs, mock_fs_scope
-from .pathutil import slashfix
 
 
 @pytest.mark.parametrize('fs_fac, expected_paths, expected_slugs', [
-        (lambda: mock_fs(), [], []),
-        (lambda: mock_fs().withPage('test/foo.html'),
-            ['foo.html'], ['foo']),
-        (lambda: mock_fs().withPage('test/foo.md'),
-            ['foo.md'], ['foo']),
-        (lambda: mock_fs().withPage('test/foo.ext'),
-            ['foo.ext'], ['foo.ext']),
-        (lambda: mock_fs().withPage('test/foo/bar.html'),
-            ['foo/bar.html'], ['foo/bar']),
-        (lambda: mock_fs().withPage('test/foo/bar.md'),
-            ['foo/bar.md'], ['foo/bar']),
-        (lambda: mock_fs().withPage('test/foo/bar.ext'),
-            ['foo/bar.ext'], ['foo/bar.ext']),
-        ])
+    (lambda: mock_fs(), [], []),
+    (lambda: mock_fs().withPage('test/foo.html'),
+     ['foo.html'], ['foo']),
+    (lambda: mock_fs().withPage('test/foo.md'),
+     ['foo.md'], ['foo']),
+    (lambda: mock_fs().withPage('test/foo.ext'),
+     ['foo.ext'], ['foo.ext']),
+    (lambda: mock_fs().withPage('test/foo/bar.html'),
+     ['foo/bar.html'], ['foo/bar']),
+    (lambda: mock_fs().withPage('test/foo/bar.md'),
+     ['foo/bar.md'], ['foo/bar']),
+    (lambda: mock_fs().withPage('test/foo/bar.ext'),
+     ['foo/bar.ext'], ['foo/bar.ext']),
+])
 def test_default_source_factories(fs_fac, expected_paths, expected_slugs):
     fs = fs_fac()
     fs.withConfig({
@@ -29,8 +27,8 @@
                 'test': {}},
             'routes': [
                 {'url': '/%path%', 'source': 'test'}]
-            }
-        })
+        }
+    })
     fs.withDir('kitchen/test')
     with mock_fs_scope(fs):
         app = PieCrust(fs.path('kitchen'), cache=False)
@@ -43,12 +41,12 @@
 
 
 @pytest.mark.parametrize(
-        'ref_path, expected_path, expected_metadata',
-        [
-            ('foo.html', '/kitchen/test/foo.html', {'slug': 'foo'}),
-            ('foo/bar.html', '/kitchen/test/foo/bar.html',
-                {'slug': 'foo/bar'}),
-        ])
+    'ref_path, expected_path, expected_metadata',
+    [
+        ('foo.html', '/kitchen/test/foo.html', {'slug': 'foo'}),
+        ('foo/bar.html', '/kitchen/test/foo/bar.html',
+         {'slug': 'foo/bar'}),
+    ])
 def test_default_source_resolve_ref(ref_path, expected_path,
                                     expected_metadata):
     fs = mock_fs()
@@ -58,8 +56,8 @@
                 'test': {}},
             'routes': [
                 {'url': '/%path%', 'source': 'test'}]
-            }
-        })
+        }
+    })
     expected_path = fs.path(expected_path).replace('/', os.sep)
     with mock_fs_scope(fs):
         app = PieCrust(fs.path('kitchen'), cache=False)
@@ -67,87 +65,3 @@
         actual_path, actual_metadata = s.resolveRef(ref_path)
         assert actual_path == expected_path
         assert actual_metadata == expected_metadata
-
-
-@pytest.mark.parametrize('page_ref, expected_source_name, expected_rel_path, '
-                         'expected_possible_paths', [
-        ('foo:one.md', 'foo', 'one.md',
-            ['foo/one.md']),
-        ('foo:two.md', 'foo', 'two.md',
-            ['foo/two.md']),
-        ('foo:two.html', 'foo', 'two.html',
-            ['foo/two.html']),
-        ('foo:two.%ext%', 'foo', 'two.html',
-            ['foo/two.html', 'foo/two.md', 'foo/two.textile']),
-        ('foo:subdir/four.md', 'foo', 'subdir/four.md',
-            ['foo/subdir/four.md']),
-        ('foo:subdir/four.%ext%', 'foo', 'subdir/four.md',
-            ['foo/subdir/four.html', 'foo/subdir/four.md',
-             'foo/subdir/four.textile']),
-        ('foo:three.md;bar:three.md', 'foo', 'three.md',
-            ['foo/three.md', 'bar/three.md']),
-        ('foo:three.%ext%;bar:three.%ext%', 'foo', 'three.md',
-            ['foo/three.html', 'foo/three.md', 'foo/three.textile',
-             'bar/three.html', 'bar/three.md', 'bar/three.textile']),
-        ('foo:special.md;bar:special.md', 'bar', 'special.md',
-            ['foo/special.md', 'bar/special.md'])
-        ])
-def test_page_ref(page_ref, expected_source_name, expected_rel_path,
-                  expected_possible_paths):
-    fs = (mock_fs()
-            .withConfig({
-                'site': {
-                    'sources': {
-                        'foo': {},
-                        'bar': {}
-                        }
-                    }
-                })
-            .withPage('foo/one.md')
-            .withPage('foo/two.md')
-            .withPage('foo/two.html')
-            .withPage('foo/three.md')
-            .withPage('foo/subdir/four.md')
-            .withPage('bar/three.md')
-            .withPage('bar/special.md'))
-    with mock_fs_scope(fs):
-        app = fs.getApp()
-        r = PageRef(app, page_ref)
-
-        assert r.possible_paths == slashfix(
-                [os.path.join(fs.path('/kitchen'), p)
-                    for p in expected_possible_paths])
-
-        assert r.exists
-        assert r.source_name == expected_source_name
-        assert r.source == app.getSource(expected_source_name)
-        assert r.rel_path == expected_rel_path
-        assert r.path == slashfix(fs.path(os.path.join(
-                'kitchen', expected_source_name, expected_rel_path)))
-
-
-def test_page_ref_with_missing_source():
-    fs = mock_fs().withConfig()
-    with mock_fs_scope(fs):
-        app = fs.getApp()
-        r = PageRef(app, 'whatever:doesnt_exist.md')
-        with pytest.raises(Exception):
-            r.possible_ref_specs
-
-
-def test_page_ref_with_missing_file():
-    fs = mock_fs().withConfig()
-    with mock_fs_scope(fs):
-        app = fs.getApp()
-        r = PageRef(app, 'pages:doesnt_exist.%ext%')
-        assert r.possible_ref_specs == [
-                'pages:doesnt_exist.html', 'pages:doesnt_exist.md',
-                'pages:doesnt_exist.textile']
-        with pytest.raises(PageNotFoundError):
-            r.source_name
-        with pytest.raises(PageNotFoundError):
-            r.rel_path
-        with pytest.raises(PageNotFoundError):
-            r.path
-        assert not r.exists
-