diff --git a/tests/test_mojave_10_14_6.py b/tests/test_mojave_10_14_6.py
index 6e61f58c..cef5d73d 100644
--- a/tests/test_mojave_10_14_6.py
+++ b/tests/test_mojave_10_14_6.py
@@ -1,3 +1,4 @@
+import pytest
 
 from osxphotos._constants import _UNKNOWN_PERSON
 
@@ -41,9 +42,46 @@ UUID_DICT = {
     "favorite": "6bxcNnzRQKGnK4uPrCJ9UQ",
     "not_favorite": "8SOE9s0XQVGsuq4ONohTng",
     "date_invalid": "YZFCPY24TUySvpu7owiqxA",
+    "hidden": "od0fmC7NQx+ayVr+%i06XA",
+    "not_hidden": "6bxcNnzRQKGnK4uPrCJ9UQ",
     "intrash": "td4yIljYS8aRAgzlsRRDtQ",
     "not_intrash": "6bxcNnzRQKGnK4uPrCJ9UQ",
+    "location": "3Jn73XpSQQCluzRBMWRsMA",
+    "no_location": "YZFCPY24TUySvpu7owiqxA",
     "has_adjustments": "6bxcNnzRQKGnK4uPrCJ9UQ",
+    "no_adjustments": "15uNd7%8RguTEgNPKHfTWw",
+    "external_edits": "3Jn73XpSQQCluzRBMWRsMA",
+    "no_external_edits": "6bxcNnzRQKGnK4uPrCJ9UQ",
+    "raw": "DZAgPwQNTWiM+T5cX3WMqA",
+    "jpeg+raw": "AcxIpfolT3KU2Ge84VG3yQ",
+    "raw+jpeg": "oTiMG6OfSP6d%nUTEOfvMg",
+    "heic": "GdJJPQX0RP63mcdKFj%sfQ",
+}
+
+RAW_PATH_DICT = {
+    "jpeg+raw": "/Masters/2020/10/05/20201005-041506/IMG_1997.cr2",
+    "raw+jpeg": "Masters/2020/10/05/20201005-041514/IMG_1994.cr2",
+}
+UUID_UTI_DICT = {
+    "DZAgPwQNTWiM+T5cX3WMqA": [
+        "com.adobe.raw-image",
+        None,
+        "com.adobe.raw-image",
+        None,
+    ],
+    "AcxIpfolT3KU2Ge84VG3yQ": [
+        "public.jpeg",
+        "com.canon.cr2-raw-image",
+        "public.jpeg",
+        None,
+    ],
+    "oTiMG6OfSP6d%nUTEOfvMg": [
+        "com.canon.cr2-raw-image",
+        "com.canon.cr2-raw-image",
+        "com.canon.cr2-raw-image",
+        None,
+    ],
+    "GdJJPQX0RP63mcdKFj%sfQ": ["public.jpeg", None, "public.heic", "public.jpeg"],
 }
 
 ALBUM_SORT_ORDER = [
@@ -58,87 +96,71 @@ PHOTOS_NOT_IN_TRASH_LEN = 12
 PHOTOS_IN_TRASH_LEN = 1
 
 
-def test_init():
+@pytest.fixture(scope="module")
+def photosdb():
+    import osxphotos
+
+    return osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+
+
+def test_init(photosdb):
     import osxphotos
 
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     assert isinstance(photosdb, osxphotos.PhotosDB)
 
 
-def test_db_version():
+def test_db_version(photosdb):
     import osxphotos
 
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     assert photosdb.db_version in osxphotos._constants._TESTED_DB_VERSIONS
     assert photosdb.db_version == "4025"
 
 
-def test_db_len():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_db_len(photosdb):
     # assert photosdb.db_version in osxphotos._TESTED_DB_VERSIONS
     assert len(photosdb) == PHOTOS_DB_LEN
 
 
-def test_persons():
-    import osxphotos
+def test_persons(photosdb):
     import collections
 
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     assert "Katie" in photosdb.persons
     assert collections.Counter(PERSONS) == collections.Counter(photosdb.persons)
 
 
-def test_keywords():
-    import osxphotos
+def test_keywords(photosdb):
     import collections
 
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     assert "wedding" in photosdb.keywords
     assert collections.Counter(KEYWORDS) == collections.Counter(photosdb.keywords)
 
 
-def test_album_names():
-    import osxphotos
+def test_album_names(photosdb):
     import collections
 
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     assert "Pumpkin Farm" in photosdb.albums
     assert collections.Counter(ALBUMS) == collections.Counter(photosdb.albums)
 
 
-def test_keywords_dict():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_keywords_dict(photosdb):
     keywords = photosdb.keywords_as_dict
     assert keywords["wedding"] == 2
     assert keywords == KEYWORDS_DICT
 
 
-def test_persons_as_dict():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_persons_as_dict(photosdb):
     persons = photosdb.persons_as_dict
     assert persons["Maria"] == 1
     assert persons == PERSONS_DICT
 
 
-def test_albums_as_dict():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_albums_as_dict(photosdb):
     albums = photosdb.albums_as_dict
     assert albums["Pumpkin Farm"] == 3
     assert albums == ALBUM_DICT
 
 
-def test_album_sort_order():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_album_sort_order(photosdb):
     album = [a for a in photosdb.album_info if a.title == "Pumpkin Farm"][0]
     photos = album.photos
 
@@ -146,11 +168,9 @@ def test_album_sort_order():
     assert uuids == ALBUM_SORT_ORDER
 
 
-def test_attributes():
+def test_attributes(photosdb):
     import datetime
-    import osxphotos
 
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     photos = photosdb.photos(uuid=["15uNd7%8RguTEgNPKHfTWw"])
     assert len(photos) == 1
     p = photos[0]
@@ -172,12 +192,10 @@ def test_attributes():
     assert p.ismissing == False
 
 
-def test_attributes_2():
+def test_attributes_2(photosdb):
     """ Test attributes including height, width, etc """
     import datetime
-    import osxphotos
 
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])
     assert len(photos) == 1
     p = photos[0]
@@ -210,10 +228,7 @@ def test_attributes_2():
     assert p.original_filesize == 460483
 
 
-def test_missing():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_missing(photosdb):
     photos = photosdb.photos(uuid=["od0fmC7NQx+ayVr+%i06XA"])
     assert len(photos) == 1
     p = photos[0]
@@ -221,53 +236,37 @@ def test_missing():
     assert p.ismissing
 
 
-def test_favorite():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_favorite(photosdb):
     photos = photosdb.photos(uuid=[UUID_DICT["favorite"]])
     assert len(photos) == 1
     p = photos[0]
     assert p.favorite == True
 
 
-def test_not_favorite():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_not_favorite(photosdb):
     photos = photosdb.photos(uuid=["od0fmC7NQx+ayVr+%i06XA"])
     assert len(photos) == 1
     p = photos[0]
     assert p.favorite == False
 
 
-def test_hidden():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=["od0fmC7NQx+ayVr+%i06XA"])
+def test_hidden(photosdb):
+    photos = photosdb.photos(uuid=[UUID_DICT["hidden"]])
     assert len(photos) == 1
     p = photos[0]
     assert p.hidden == True
 
 
-def test_not_hidden():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=["6bxcNnzRQKGnK4uPrCJ9UQ"])
+def test_not_hidden(photosdb):
+    photos = photosdb.photos(uuid=[UUID_DICT["not_hidden"]])
     assert len(photos) == 1
     p = photos[0]
     assert p.hidden == False
 
 
-def test_location_1():
+def test_location_1(photosdb):
     # test photo with lat/lon info
-    import osxphotos
-    import pytest
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=["3Jn73XpSQQCluzRBMWRsMA"])
+    photos = photosdb.photos(uuid=[UUID_DICT["location"]])
     assert len(photos) == 1
     p = photos[0]
     lat, lon = p.location
@@ -275,12 +274,9 @@ def test_location_1():
     assert lon == pytest.approx(-0.1318055)
 
 
-def test_location_2():
+def test_location_2(photosdb):
     # test photo with no location info
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=["YZFCPY24TUySvpu7owiqxA"])
+    photos = photosdb.photos(uuid=[UUID_DICT["no_location"]])
     assert len(photos) == 1
     p = photos[0]
     lat, lon = p.location
@@ -288,59 +284,45 @@ def test_location_2():
     assert lon is None
 
 
-def test_hasadjustments1():
+def test_hasadjustments1(photosdb):
     # test hasadjustments == True
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=["6bxcNnzRQKGnK4uPrCJ9UQ"])
+    photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])
     assert len(photos) == 1
     p = photos[0]
     assert p.hasadjustments == True
 
 
-def test_hasadjustments2():
+def test_hasadjustments2(photosdb):
     # test hasadjustments == False
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=["15uNd7%8RguTEgNPKHfTWw"])
+    photos = photosdb.photos(uuid=[UUID_DICT["no_adjustments"]])
     assert len(photos) == 1
     p = photos[0]
     assert p.hasadjustments == False
 
 
-def test_external_edit1():
+def test_external_edit1(photosdb):
     # test image has been edited in external editor
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=["3Jn73XpSQQCluzRBMWRsMA"])
+    photos = photosdb.photos(uuid=[UUID_DICT["external_edits"]])
     assert len(photos) == 1
     p = photos[0]
 
     assert p.external_edit == True
 
 
-def test_external_edit2():
+def test_external_edit2(photosdb):
     # test image has not been edited in external editor
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=["6bxcNnzRQKGnK4uPrCJ9UQ"])
+    photos = photosdb.photos(uuid=[UUID_DICT["no_external_edits"]])
     assert len(photos) == 1
     p = photos[0]
 
     assert p.external_edit == False
 
 
-def test_path_edited1():
+def test_path_edited1(photosdb):
     # test a valid edited path
     import os.path
-    import osxphotos
 
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=["6bxcNnzRQKGnK4uPrCJ9UQ"])
+    photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])
     assert len(photos) == 1
     p = photos[0]
     path = p.path_edited
@@ -348,95 +330,64 @@ def test_path_edited1():
     assert os.path.exists(path)
 
 
-def test_path_edited2():
+def test_path_edited2(photosdb):
     # test an invalid edited path
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=["15uNd7%8RguTEgNPKHfTWw"])
+    photos = photosdb.photos(uuid=[UUID_DICT["no_adjustments"]])
     assert len(photos) == 1
     p = photos[0]
     path = p.path_edited
     assert path is None
 
 
-def test_count():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_count(photosdb):
     photos = photosdb.photos()
     assert len(photos) == PHOTOS_NOT_IN_TRASH_LEN
 
 
-def test_photos_intrash_1():
+def test_photos_intrash_1(photosdb):
     """ test PhotosDB.photos(intrash=True) """
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     photos = photosdb.photos(intrash=True)
     assert len(photos) == PHOTOS_IN_TRASH_LEN
 
 
-def test_photos_intrash_2():
+def test_photos_intrash_2(photosdb):
     """ test PhotosDB.photos(intrash=True) """
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     photos = photosdb.photos(intrash=True)
     for p in photos:
         assert p.intrash
 
 
-def test_photos_intrash_2():
+def test_photos_not_intrash(photosdb):
     """ test PhotosDB.photos(intrash=False) """
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     photos = photosdb.photos(intrash=False)
     for p in photos:
         assert not p.intrash
 
 
-def test_photoinfo_intrash_1():
+def test_photoinfo_intrash_1(photosdb):
     """ Test PhotoInfo.intrash """
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     p = photosdb.photos(uuid=[UUID_DICT["intrash"]], intrash=True)[0]
     assert p.intrash
 
 
-def test_photoinfo_intrash_2():
+def test_photoinfo_intrash_2(photosdb):
     """ Test PhotoInfo.intrash and intrash=default"""
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     p = photosdb.photos(uuid=[UUID_DICT["intrash"]])
     assert not p
 
 
-def test_photoinfo_not_intrash():
+def test_photoinfo_not_intrash(photosdb):
     """ Test PhotoInfo.intrash """
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     p = photosdb.photos(uuid=[UUID_DICT["not_intrash"]])[0]
     assert not p.intrash
 
 
-def test_keyword_2():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_keyword_2(photosdb):
     photos = photosdb.photos(keywords=["wedding"])
     assert len(photos) == 2
 
 
-def test_keyword_not_in_album():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-
+def test_keyword_not_in_album(photosdb):
     # find all photos with keyword "Kids" not in the album "Pumpkin Farm"
     photos1 = photosdb.photos(albums=["Pumpkin Farm"])
     photos2 = photosdb.photos(keywords=["Kids"])
@@ -445,18 +396,12 @@ def test_keyword_not_in_album():
     assert photos3[0].uuid == "od0fmC7NQx+ayVr+%i06XA"
 
 
-def test_get_db_path():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_get_db_path(photosdb):
     db_path = photosdb.db_path
     assert db_path.endswith(PHOTOS_DB_PATH)
 
 
-def test_get_library_path():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+def test_get_library_path(photosdb):
     lib_path = photosdb.library_path
     assert lib_path.endswith(PHOTOS_LIBRARY_PATH)
 
@@ -475,7 +420,7 @@ def test_photosdb_repr():
 
 def test_photosinfo_repr():
     import osxphotos
-    import datetime
+    import datetime  # needed for eval to work
 
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     photos = photosdb.photos(uuid=[UUID_DICT["favorite"]])
@@ -487,48 +432,34 @@ def test_photosinfo_repr():
     }
 
 
-def test_multi_uuid():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(PHOTOS_DB)
+def test_multi_uuid(photosdb):
     photos = photosdb.photos(uuid=[UUID_DICT["favorite"], UUID_DICT["not_favorite"]])
 
     assert len(photos) == 2
 
 
-def test_multi_keyword():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(PHOTOS_DB)
+def test_multi_keyword(photosdb):
     photos = photosdb.photos(keywords=["Kids", "wedding"])
 
     assert len(photos) == 6
 
 
-def test_multi_album():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(PHOTOS_DB)
+def test_multi_album(photosdb):
     photos = photosdb.photos(albums=["Pumpkin Farm", "Test Album"])
 
     assert len(photos) == 3
 
 
-def test_multi_person():
-    import osxphotos
-
-    photosdb = osxphotos.PhotosDB(PHOTOS_DB)
+def test_multi_person(photosdb):
     photos = photosdb.photos(persons=["Katie", "Suzy"])
 
     assert len(photos) == 3
 
 
-def test_date_invalid():
+def test_date_invalid(photosdb):
     """ Test date is invalid """
     from datetime import datetime, timedelta, timezone
-    import osxphotos
 
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     photos = photosdb.photos(uuid=[UUID_DICT["date_invalid"]])
     assert len(photos) == 1
     p = photos[0]
@@ -537,13 +468,40 @@ def test_date_invalid():
     assert p.date == datetime(1970, 1, 1).astimezone(tz=tz)
 
 
-def test_date_modified_invalid():
+def test_date_modified_invalid(photosdb):
     """ Test date modified is invalid """
-    from datetime import datetime, timedelta, timezone
-    import osxphotos
 
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     photos = photosdb.photos(uuid=[UUID_DICT["date_invalid"]])
     assert len(photos) == 1
     p = photos[0]
     assert p.date_modified is None
+
+
+def test_uti(photosdb):
+    for uuid, utis in UUID_UTI_DICT.items():
+        photo = photosdb.get_photo(uuid)
+        assert photo.uti == utis[0]
+        assert photo.uti_raw == utis[1]
+        assert photo.uti_original == utis[2]
+        assert photo.uti_edited == utis[3]
+
+
+def test_raw(photosdb):
+    photo = photosdb.get_photo(UUID_DICT["raw"])
+    # assert photo.israw
+    assert not photo.has_raw
+    assert photo.uti_raw == None
+    assert photo.uti == "com.adobe.raw-image"
+    assert photo.path_raw is None
+
+    photo = photosdb.get_photo(UUID_DICT["jpeg+raw"])
+    assert photo.has_raw
+    assert photo.path_raw.endswith(RAW_PATH_DICT["jpeg+raw"])
+
+    photo = photosdb.get_photo(UUID_DICT["raw+jpeg"])
+    assert photo.has_raw
+    assert photo.path_raw.endswith(RAW_PATH_DICT["raw+jpeg"])
+
+    photo = photosdb.get_photo(UUID_DICT["heic"])
+    assert not photo.has_raw
+    assert photo.path_raw is None