diff --git a/Aaru.Tests/Images/CDRWin.cs b/Aaru.Tests/Images/CDRWin.cs
index 30f80459c..1f49551ac 100644
--- a/Aaru.Tests/Images/CDRWin.cs
+++ b/Aaru.Tests/Images/CDRWin.cs
@@ -47,8 +47,8 @@ namespace Aaru.Tests.Images
                 TestFile  = "pcengine.cue",
                 MediaType = MediaType.CD,
                 Sectors   = 160956,
-                MD5       = "8eb436b476c9df343acb89ac1ba7e1b4",
-                LongMD5   = "bdcd5cabf4f48333f9dbb08967dce7a8",
+                MD5       = "875ea735f0d10d6fa321fb222714117b",
+                LongMD5   = "0188cf74fdc367a8e370bbe236a5100c",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -63,118 +63,118 @@ namespace Aaru.Tests.Images
                     {
                         Session = 1,
                         Start   = 3365,
-                        End     = 38238,
+                        End     = 38463,
                         Pregap  = 225,
                         Flags   = 4
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 38239,
-                        End     = 46691,
+                        Start   = 38464,
+                        End     = 47066,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 46692,
-                        End     = 52975,
+                        Start   = 47067,
+                        End     = 53350,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 52976,
-                        End     = 61293,
+                        Start   = 53351,
+                        End     = 61668,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 61294,
-                        End     = 68037,
+                        Start   = 61669,
+                        End     = 68412,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 68038,
-                        End     = 74871,
+                        Start   = 68413,
+                        End     = 75246,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 74872,
-                        End     = 82604,
+                        Start   = 75247,
+                        End     = 82979,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 82605,
-                        End     = 85955,
+                        Start   = 82980,
+                        End     = 86330,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 85956,
-                        End     = 90741,
+                        Start   = 86331,
+                        End     = 91116,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 90742,
-                        End     = 98748,
+                        Start   = 91117,
+                        End     = 99123,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 98749,
-                        End     = 106167,
+                        Start   = 99124,
+                        End     = 106542,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 106168,
-                        End     = 111712,
+                        Start   = 106543,
+                        End     = 112087,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 111713,
-                        End     = 119744,
+                        Start   = 112088,
+                        End     = 120119,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 119745,
-                        End     = 125628,
+                        Start   = 120120,
+                        End     = 126003,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 125629,
+                        Start   = 126004,
                         End     = 160955,
                         Pregap  = 225,
                         Flags   = 4
@@ -186,8 +186,8 @@ namespace Aaru.Tests.Images
                 TestFile  = "pcfx.cue",
                 MediaType = MediaType.CD,
                 Sectors   = 246680,
-                MD5       = "73e2855fff156f95fb8f0ae7c58d1b9d",
-                LongMD5   = "f421fc4af3ac528911b6d824825ff9b5",
+                MD5       = "d2fbcb46735a5ac90c10f81ca564c9dd",
+                LongMD5   = "f10ae52c1a530ba3ed49447417d9451e",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -202,54 +202,54 @@ namespace Aaru.Tests.Images
                     {
                         Session = 1,
                         Start   = 4170,
-                        End     = 4683,
+                        End     = 4908,
                         Pregap  = 225,
                         Flags   = 4
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 4684,
-                        End     = 5715,
+                        Start   = 4909,
+                        End     = 5940,
                         Pregap  = 0,
                         Flags   = 4
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 5716,
-                        End     = 41833,
+                        Start   = 5941,
+                        End     = 42058,
                         Pregap  = 0,
                         Flags   = 4
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 41834,
-                        End     = 220419,
+                        Start   = 42059,
+                        End     = 220644,
                         Pregap  = 0,
                         Flags   = 4
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 220420,
-                        End     = 225120,
+                        Start   = 220645,
+                        End     = 225495,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 225121,
-                        End     = 234972,
+                        Start   = 225496,
+                        End     = 235347,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 234973,
+                        Start   = 235348,
                         End     = 246679,
                         Pregap  = 150,
                         Flags   = 0
@@ -540,8 +540,8 @@ namespace Aaru.Tests.Images
                 TestFile  = "test_multi_karaoke_sampler.cue",
                 MediaType = MediaType.CDROMXA,
                 Sectors   = 329158,
-                MD5       = "f09312ba25a479fb81912a2965babd22",
-                LongMD5   = "f48603d11883593f45ec4a3824681e4e",
+                MD5       = "397d93a649a2a502cf831b49771a2c35",
+                LongMD5   = "c92ec0c7671b1b992d94a726ea10a238",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -556,118 +556,118 @@ namespace Aaru.Tests.Images
                     {
                         Session = 1,
                         Start   = 1737,
-                        End     = 32448,
+                        End     = 32598,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 32449,
-                        End     = 52371,
+                        Start   = 32599,
+                        End     = 52521,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 52372,
-                        End     = 70003,
+                        Start   = 52522,
+                        End     = 70153,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 70004,
-                        End     = 99797,
+                        Start   = 70154,
+                        End     = 99947,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 99798,
-                        End     = 119460,
+                        Start   = 99948,
+                        End     = 119610,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 119461,
-                        End     = 136698,
+                        Start   = 119611,
+                        End     = 136848,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 136699,
-                        End     = 155489,
+                        Start   = 136849,
+                        End     = 155639,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 155490,
-                        End     = 175525,
+                        Start   = 155640,
+                        End     = 175675,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 175526,
-                        End     = 206160,
+                        Start   = 175676,
+                        End     = 206310,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 206161,
-                        End     = 226149,
+                        Start   = 206311,
+                        End     = 226299,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 226150,
-                        End     = 244054,
+                        Start   = 226300,
+                        End     = 244204,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 244055,
-                        End     = 273664,
+                        Start   = 244205,
+                        End     = 273814,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 273665,
-                        End     = 293451,
+                        Start   = 273815,
+                        End     = 293601,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 293452,
-                        End     = 310410,
+                        Start   = 293602,
+                        End     = 310560,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 310411,
+                        Start   = 310561,
                         End     = 329157,
                         Pregap  = 150,
                         Flags   = 0
@@ -881,9 +881,9 @@ namespace Aaru.Tests.Images
                 TestFile      = "cdg_test_multi_karaoke_sampler.cue",
                 MediaType     = MediaType.CDG,
                 Sectors       = 329158,
-                MD5           = "f09312ba25a479fb81912a2965babd22",
-                LongMD5       = "f48603d11883593f45ec4a3824681e4e",
-                SubchannelMD5 = "UNKNOWN",
+                MD5           = "be1bdbd55883dd53397ea21715107706",
+                LongMD5       = "3d3a8e2243f40201c6bdc5c10a65bb76",
+                SubchannelMD5 = "f9794c8d8ab2c7bf7815e740a77b12f4",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -898,118 +898,118 @@ namespace Aaru.Tests.Images
                     {
                         Session = 1,
                         Start   = 1737,
-                        End     = 32448,
+                        End     = 32598,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 32449,
-                        End     = 52371,
+                        Start   = 32599,
+                        End     = 52521,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 52372,
-                        End     = 70003,
+                        Start   = 52522,
+                        End     = 70153,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 70004,
-                        End     = 99797,
+                        Start   = 70154,
+                        End     = 99947,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 99798,
-                        End     = 119460,
+                        Start   = 99948,
+                        End     = 119610,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 119461,
-                        End     = 136698,
+                        Start   = 119611,
+                        End     = 136848,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 136699,
-                        End     = 155489,
+                        Start   = 136849,
+                        End     = 155639,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 155490,
-                        End     = 175525,
+                        Start   = 155640,
+                        End     = 175675,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 175526,
-                        End     = 206160,
+                        Start   = 175676,
+                        End     = 206310,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 206161,
-                        End     = 226149,
+                        Start   = 206311,
+                        End     = 226299,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 226150,
-                        End     = 244054,
+                        Start   = 226300,
+                        End     = 244204,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 244055,
-                        End     = 273664,
+                        Start   = 244205,
+                        End     = 273814,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 273665,
-                        End     = 293451,
+                        Start   = 273815,
+                        End     = 293601,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 293452,
-                        End     = 310410,
+                        Start   = 293602,
+                        End     = 310560,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 310411,
+                        Start   = 310561,
                         End     = 329157,
                         Pregap  = 150,
                         Flags   = 0
@@ -1021,9 +1021,9 @@ namespace Aaru.Tests.Images
                 TestFile      = "cooked_cdg_test_multi_karaoke_sampler.cue",
                 MediaType     = MediaType.CDG,
                 Sectors       = 329158,
-                MD5           = "f09312ba25a479fb81912a2965babd22",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
+                MD5           = "215c0b3efab1b04e4f2d35b323cdbc96",
+                LongMD5       = "296cfef5de90e1cfadaf2ecf41f2e184",
+                SubchannelMD5 = "536ebf5b21280a721dc0604739ca7db3",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -1038,118 +1038,118 @@ namespace Aaru.Tests.Images
                     {
                         Session = 1,
                         Start   = 1737,
-                        End     = 32448,
+                        End     = 32598,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 32449,
-                        End     = 52371,
+                        Start   = 32599,
+                        End     = 52521,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 52372,
-                        End     = 70003,
+                        Start   = 52522,
+                        End     = 70153,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 70004,
-                        End     = 99797,
+                        Start   = 70154,
+                        End     = 99947,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 99798,
-                        End     = 119460,
+                        Start   = 99948,
+                        End     = 119610,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 119461,
-                        End     = 136698,
+                        Start   = 119611,
+                        End     = 136848,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 136699,
-                        End     = 155489,
+                        Start   = 136849,
+                        End     = 155639,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 155490,
-                        End     = 175525,
+                        Start   = 155640,
+                        End     = 175675,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 175526,
-                        End     = 206160,
+                        Start   = 175676,
+                        End     = 206310,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 206161,
-                        End     = 226149,
+                        Start   = 206311,
+                        End     = 226299,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 226150,
-                        End     = 244054,
+                        Start   = 226300,
+                        End     = 244204,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 244055,
-                        End     = 273664,
+                        Start   = 244205,
+                        End     = 273814,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 273665,
-                        End     = 293451,
+                        Start   = 273815,
+                        End     = 293601,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 293452,
-                        End     = 310410,
+                        Start   = 293602,
+                        End     = 310560,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 310411,
+                        Start   = 310561,
                         End     = 329157,
                         Pregap  = 150,
                         Flags   = 0
@@ -1199,8 +1199,8 @@ namespace Aaru.Tests.Images
                 TestFile  = "cooked_test_multi_karaoke_sampler.cue",
                 MediaType = MediaType.CDROMXA,
                 Sectors   = 329158,
-                MD5       = "f09312ba25a479fb81912a2965babd22",
-                LongMD5   = "f48603d11883593f45ec4a3824681e4e",
+                MD5       = "bb1ace550c0a22f18c32bd053739d6ce",
+                LongMD5   = "857b80195d1e29bd0bace2ef20b733ed",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -1215,118 +1215,118 @@ namespace Aaru.Tests.Images
                     {
                         Session = 1,
                         Start   = 1737,
-                        End     = 32448,
+                        End     = 32598,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 32449,
-                        End     = 52371,
+                        Start   = 32599,
+                        End     = 52521,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 52372,
-                        End     = 70003,
+                        Start   = 52522,
+                        End     = 70153,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 70004,
-                        End     = 99797,
+                        Start   = 70154,
+                        End     = 99947,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 99798,
-                        End     = 119460,
+                        Start   = 99948,
+                        End     = 119610,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 119461,
-                        End     = 136698,
+                        Start   = 119611,
+                        End     = 136848,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 136699,
-                        End     = 155489,
+                        Start   = 136849,
+                        End     = 155639,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 155490,
-                        End     = 175525,
+                        Start   = 155640,
+                        End     = 175675,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 175526,
-                        End     = 206160,
+                        Start   = 175676,
+                        End     = 206310,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 206161,
-                        End     = 226149,
+                        Start   = 206311,
+                        End     = 226299,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 226150,
-                        End     = 244054,
+                        Start   = 226300,
+                        End     = 244204,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 244055,
-                        End     = 273664,
+                        Start   = 244205,
+                        End     = 273814,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 273665,
-                        End     = 293451,
+                        Start   = 273815,
+                        End     = 293601,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 293452,
-                        End     = 310410,
+                        Start   = 293602,
+                        End     = 310560,
                         Pregap  = 150,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 310411,
+                        Start   = 310561,
                         End     = 329157,
                         Pregap  = 150,
                         Flags   = 0
diff --git a/Aaru.Tests/Images/MagicISO/Cuesheet.cs b/Aaru.Tests/Images/MagicISO/Cuesheet.cs
index dda7ef011..190063d7f 100644
--- a/Aaru.Tests/Images/MagicISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/MagicISO/Cuesheet.cs
@@ -476,6 +476,7 @@ namespace Aaru.Tests.Images.MagicISO
                     }
                 }
             },
+            /* This image is invalid an impossible to process properly due to a bug in MagicISO
             new OpticalImageTestExpected
             {
                 TestFile  = "report_enhancedcd.cue",
@@ -599,7 +600,7 @@ namespace Aaru.Tests.Images.MagicISO
                     }
                 }
             },
-            new OpticalImageTestExpected
+            */ new OpticalImageTestExpected
             {
                 TestFile  = "test_multi_karaoke_sampler.cue",
                 MediaType = MediaType.CDROMXA,
diff --git a/Aaru.Tests/Images/MagicISO/Nero.cs b/Aaru.Tests/Images/MagicISO/Nero.cs
index e34f51dcf..39edf99ff 100644
--- a/Aaru.Tests/Images/MagicISO/Nero.cs
+++ b/Aaru.Tests/Images/MagicISO/Nero.cs
@@ -46,15 +46,15 @@ namespace Aaru.Tests.Images.MagicISO
             {
                 TestFile  = "cdiready_the_apprentice.nrg",
                 MediaType = MediaType.CDDA,
-                Sectors   = 261150,
-                MD5       = "ab350df419f96d967f51d0161ebeba63",
-                LongMD5   = "ab350df419f96d967f51d0161ebeba63",
+                Sectors   = 279300,
+                MD5       = "7557c72d4cf6df8bc1896388b863727a",
+                LongMD5   = "7557c72d4cf6df8bc1896388b863727a",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 69000,
+                        Start   = 0,
                         End     = 88799,
                         Pregap  = 150,
                         Flags   = 0
@@ -223,7 +223,7 @@ namespace Aaru.Tests.Images.MagicISO
                     {
                         Session = 1,
                         Start   = 274275,
-                        End     = 279298,
+                        End     = 279299,
                         Pregap  = 0,
                         Flags   = 0
                     }
@@ -233,9 +233,9 @@ namespace Aaru.Tests.Images.MagicISO
             {
                 TestFile  = "report_audiocd.nrg",
                 MediaType = MediaType.CDDA,
-                Sectors   = 247223,
-                MD5       = "277e98295297f618cc63687e98288d7e",
-                LongMD5   = "277e98295297f618cc63687e98288d7e",
+                Sectors   = 247073,
+                MD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+                LongMD5   = "c09f408a4416634d8ac1c1ffd0ed75a5",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -249,9 +249,9 @@ namespace Aaru.Tests.Images.MagicISO
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 16399,
+                        Start   = 16549,
                         End     = 30050,
-                        Pregap  = 150,
+                        Pregap  = 0,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
@@ -346,7 +346,7 @@ namespace Aaru.Tests.Images.MagicISO
                     {
                         Session = 1,
                         Start   = 224449,
-                        End     = 247071,
+                        End     = 247072,
                         Pregap  = 0,
                         Flags   = 0
                     }
@@ -357,15 +357,15 @@ namespace Aaru.Tests.Images.MagicISO
                 TestFile  = "report_cdrom.nrg",
                 MediaType = MediaType.CDROM,
                 Sectors   = 254265,
-                MD5       = "2de6dd5eaa71c1a97625bab68382da60",
-                LongMD5   = "222edd2c920b63aefe2087ed6278abe6",
+                MD5       = "3e4bb9e72f919b1ca57619ee184abf34",
+                LongMD5   = "cb86fa221af9af8a45bd85770ae7f95b",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 0,
-                        End     = 254263,
+                        End     = 254264,
                         Pregap  = 150,
                         Flags   = 4
                     }
@@ -376,15 +376,15 @@ namespace Aaru.Tests.Images.MagicISO
                 TestFile  = "report_cdrw.nrg",
                 MediaType = MediaType.CDROM,
                 Sectors   = 308224,
-                MD5       = "f1510c82ea4ff535415833242adddac6",
-                LongMD5   = "22bd168e59e075229821448b60d1820b",
+                MD5       = "5ffabc269fd21d497f5aa6df02375948",
+                LongMD5   = "b46ca9e3c934ad64f86eccef9a829517",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 0,
-                        End     = 308222,
+                        End     = 308223,
                         Pregap  = 150,
                         Flags   = 4
                     }
@@ -393,90 +393,90 @@ namespace Aaru.Tests.Images.MagicISO
             new OpticalImageTestExpected
             {
                 TestFile  = "report_dvdram_v1.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 1218960,
-                MD5       = "192aea84e64cb396cc0f637a611788bf",
-                LongMD5   = "192aea84e64cb396cc0f637a611788bf",
+                MediaType = MediaType.DVDROM,
+                Sectors   = 1218811,
+                MD5       = "e2d40f64b4ae274c3ef55252fbda99cf",
+                LongMD5   = "e2d40f64b4ae274c3ef55252fbda99cf",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 0,
-                        End     = 1218958,
-                        Pregap  = 150
+                        End     = 1218810,
+                        Pregap  = 0
                     }
                 }
             },
             new OpticalImageTestExpected
             {
                 TestFile  = "report_dvdram_v2.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 2236704,
-                MD5       = "fa5cb9657d9ed429a41913027d7b27eb",
-                LongMD5   = "fa5cb9657d9ed429a41913027d7b27eb",
+                MediaType = MediaType.DVDROM,
+                Sectors   = 2236555,
+                MD5       = "d46730ef92b0115505d9035f78d90ca3",
+                LongMD5   = "d46730ef92b0115505d9035f78d90ca3",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 0,
-                        End     = 2236702,
-                        Pregap  = 150
+                        End     = 2236554,
+                        Pregap  = 0
                     }
                 }
             },
             new OpticalImageTestExpected
             {
                 TestFile  = "report_dvd+r-dl.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 3455936,
-                MD5       = "cf5ba4a055c6bdb4c9287c52b01c4ffb",
-                LongMD5   = "cf5ba4a055c6bdb4c9287c52b01c4ffb",
+                MediaType = MediaType.DVDROM,
+                Sectors   = 13099755,
+                MD5       = "3b36362c20c5a75cb4726d64a7e2729c",
+                LongMD5   = "3b36362c20c5a75cb4726d64a7e2729c",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 0,
-                        End     = 3455934,
-                        Pregap  = 150
+                        End     = 13099754,
+                        Pregap  = 0
                     }
                 }
             },
             new OpticalImageTestExpected
             {
                 TestFile  = "report_dvd-rom.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 2146368,
-                MD5       = "8ed49c810da17e7957962df4b07ca9a6",
-                LongMD5   = "8ed49c810da17e7957962df4b07ca9a6",
+                MediaType = MediaType.DVDROM,
+                Sectors   = 2146219,
+                MD5       = "117c7207751e4d94d6b396f77d3ef367",
+                LongMD5   = "117c7207751e4d94d6b396f77d3ef367",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 0,
-                        End     = 2146366,
-                        Pregap  = 150
+                        End     = 2146218,
+                        Pregap  = 0
                     }
                 }
             },
             new OpticalImageTestExpected
             {
                 TestFile  = "report_dvd+rw.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 2295104,
-                MD5       = "d7a519529ca4a4ad04a6e14858f92a33",
-                LongMD5   = "d7a519529ca4a4ad04a6e14858f92a33",
+                MediaType = MediaType.DVDROM,
+                Sectors   = 2294955,
+                MD5       = "3313752e2493fce618ced27aecffc79b",
+                LongMD5   = "3313752e2493fce618ced27aecffc79b",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 0,
-                        End     = 2295102,
-                        Pregap  = 150
+                        End     = 2294954,
+                        Pregap  = 0
                     }
                 }
             },
@@ -484,9 +484,9 @@ namespace Aaru.Tests.Images.MagicISO
             {
                 TestFile  = "report_enhancedcd.nrg",
                 MediaType = MediaType.CDROMXA,
-                Sectors   = 314864,
-                MD5       = "0ac3eaefdd2c138e86229d195d63cba2",
-                LongMD5   = "2524762a816af8e8c188b971dfd27374",
+                Sectors   = 303316,
+                MD5       = "a5114fe68a09e7fec8703c2f791c6a6f",
+                LongMD5   = "7867495f914aca289ab579be862affc0",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -500,9 +500,9 @@ namespace Aaru.Tests.Images.MagicISO
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 15511,
+                        Start   = 15661,
                         End     = 33958,
-                        Pregap  = 150,
+                        Pregap  = 0,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
@@ -589,16 +589,16 @@ namespace Aaru.Tests.Images.MagicISO
                     {
                         Session = 1,
                         Start   = 201441,
-                        End     = 234179,
+                        End     = 222779,
                         Pregap  = 0,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303314,
-                        Pregap  = 150,
+                        Session = 1,
+                        Start   = 222782,
+                        End     = 303315,
+                        Pregap  = 11398,
                         Flags   = 4
                     }
                 }
@@ -607,9 +607,9 @@ namespace Aaru.Tests.Images.MagicISO
             {
                 TestFile  = "test_multi_karaoke_sampler.nrg",
                 MediaType = MediaType.CDROMXA,
-                Sectors   = 329307,
-                MD5       = "cc6354d06b009b0446012842c7f94be7",
-                LongMD5   = "bb3ebf139ebb76fff1b229a379d289e4",
+                Sectors   = 329158,
+                MD5       = "67910cdb1df3f7a9546f3680dd50536d",
+                LongMD5   = "4af3996c98b668218d405062afcc2637",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -623,9 +623,9 @@ namespace Aaru.Tests.Images.MagicISO
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 1737,
+                        Start   = 1887,
                         End     = 32748,
-                        Pregap  = 150,
+                        Pregap  = 0,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
@@ -736,7 +736,7 @@ namespace Aaru.Tests.Images.MagicISO
                     {
                         Session = 1,
                         Start   = 310711,
-                        End     = 329156,
+                        End     = 329157,
                         Pregap  = 0,
                         Flags   = 0
                     }
@@ -745,17 +745,17 @@ namespace Aaru.Tests.Images.MagicISO
             new OpticalImageTestExpected
             {
                 TestFile  = "report_dvd-r.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 2146368,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
+                MediaType = MediaType.DVDROM,
+                Sectors   = 2146219,
+                MD5       = "117c7207751e4d94d6b396f77d3ef367",
+                LongMD5   = "117c7207751e4d94d6b396f77d3ef367",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 0,
-                        End     = 2146367,
+                        End     = 2146218,
                         Pregap  = 0
                     }
                 }
@@ -763,17 +763,17 @@ namespace Aaru.Tests.Images.MagicISO
             new OpticalImageTestExpected
             {
                 TestFile  = "report_dvd-rw.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 2146368,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
+                MediaType = MediaType.DVDROM,
+                Sectors   = 2146219,
+                MD5       = "117c7207751e4d94d6b396f77d3ef367",
+                LongMD5   = "117c7207751e4d94d6b396f77d3ef367",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 0,
-                        End     = 2146367,
+                        End     = 2146218,
                         Pregap  = 0
                     }
                 }
diff --git a/Aaru.Tests/Images/PowerISO/Cuesheet.cs b/Aaru.Tests/Images/PowerISO/Cuesheet.cs
index 995be20b9..97255ff07 100644
--- a/Aaru.Tests/Images/PowerISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/PowerISO/Cuesheet.cs
@@ -391,6 +391,7 @@ namespace Aaru.Tests.Images.PowerISO
                     }
                 }
             },
+            /* These images are corrupted by PowerISO beyond repair
             new OpticalImageTestExpected
             {
                 TestFile  = "report_dvdram_v1.cue",
@@ -429,6 +430,8 @@ namespace Aaru.Tests.Images.PowerISO
                     }
                 }
             },
+            */
+            /* This image is invalid an impossible to process properly due to a bug in PowerISO
             new OpticalImageTestExpected
             {
                 TestFile  = "report_enhancedcd.cue",
@@ -552,7 +555,7 @@ namespace Aaru.Tests.Images.PowerISO
                     }
                 }
             },
-            new OpticalImageTestExpected
+            */ new OpticalImageTestExpected
             {
                 TestFile  = "test_multi_karaoke_sampler.cue",
                 MediaType = MediaType.CDROMXA,
diff --git a/Aaru.Tests/Images/UltraISO/CloneCD.cs b/Aaru.Tests/Images/UltraISO/CloneCD.cs
index 7119c3a1a..d76427f25 100644
--- a/Aaru.Tests/Images/UltraISO/CloneCD.cs
+++ b/Aaru.Tests/Images/UltraISO/CloneCD.cs
@@ -47,19 +47,19 @@ namespace Aaru.Tests.Images.UltraISO
             {
                 TestFile      = "cdiready_the_apprentice.ccd",
                 MediaType     = MediaType.CDDA,
-                Sectors       = 210150,
-                MD5           = "f6bd226d3f249fa821460aeb1393cf3b",
-                LongMD5       = "f6bd226d3f249fa821460aeb1393cf3b",
-                SubchannelMD5 = "864c1fc074773d109fe556f93b70be24",
+                Sectors       = 279300,
+                MD5           = "71fc4b536d1c9f2091191a73bee61224",
+                LongMD5       = "71fc4b536d1c9f2091191a73bee61224",
+                SubchannelMD5 = "1e861faaed927d1d87481af9be144e82",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 69150,
+                        Start   = 0,
                         End     = 88799,
-                        Pregap  = 150,
-                        Flags   = 4
+                        Pregap  = 69300,
+                        Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
@@ -399,10 +399,10 @@ namespace Aaru.Tests.Images.UltraISO
             {
                 TestFile      = "report_enhancedcd.ccd",
                 MediaType     = MediaType.CDROMXA,
-                Sectors       = 291916,
-                MD5           = "588d8ff1fef693bbe5719ac6c2f96bc1",
-                LongMD5       = "d72e737f49482d1330e8fe03b9f40b79",
-                SubchannelMD5 = "266d259c5ac40b253f28ccfc452d0046",
+                Sectors       = 303316,
+                MD5           = "d9cac5c4bca6b7602dba1c24d2422dc8",
+                LongMD5       = "7803befa8bcbfec1f1436007e655bc64",
+                SubchannelMD5 = "1a33cf859da5c39486a8cbd15ed1fce9",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -512,7 +512,7 @@ namespace Aaru.Tests.Images.UltraISO
                     new TrackInfoTestExpected
                     {
                         Session = 2,
-                        Start   = 234180,
+                        Start   = 234030,
                         End     = 303315,
                         Pregap  = 150,
                         Flags   = 0
diff --git a/Aaru.Tests/Images/UltraISO/Cuesheet.cs b/Aaru.Tests/Images/UltraISO/Cuesheet.cs
index 06b4e8f41..62b13d2bb 100644
--- a/Aaru.Tests/Images/UltraISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/UltraISO/Cuesheet.cs
@@ -448,6 +448,7 @@ namespace Aaru.Tests.Images.UltraISO
                     }
                 }
             },
+            /* This image is invalid an impossible to process properly due to a bug in UltraISO
             new OpticalImageTestExpected
             {
                 TestFile  = "report_enhancedcd.cue",
@@ -571,7 +572,7 @@ namespace Aaru.Tests.Images.UltraISO
                     }
                 }
             },
-            new OpticalImageTestExpected
+            */ new OpticalImageTestExpected
             {
                 TestFile  = "test_multi_karaoke_sampler.cue",
                 MediaType = MediaType.CDROMXA,
diff --git a/Aaru.Tests/Images/UltraISO/Nero.cs b/Aaru.Tests/Images/UltraISO/Nero.cs
index b8a06568f..1059f8071 100644
--- a/Aaru.Tests/Images/UltraISO/Nero.cs
+++ b/Aaru.Tests/Images/UltraISO/Nero.cs
@@ -46,9 +46,9 @@ namespace Aaru.Tests.Images.UltraISO
             {
                 TestFile      = "cdiready_the_apprentice.nrg",
                 MediaType     = MediaType.CDDA,
-                Sectors       = 210150,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
+                Sectors       = 279300,
+                MD5           = "f6bd226d3f249fa821460aeb1393cf3b",
+                LongMD5       = "f6bd226d3f249fa821460aeb1393cf3b",
                 SubchannelMD5 = "UNKNOWN",
                 Tracks = new[]
                 {
@@ -64,7 +64,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 88800,
-                        End     = 38474,
+                        End     = 107624,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -72,7 +72,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 107625,
-                        End     = 43049,
+                        End     = 112199,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -80,7 +80,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 112200,
-                        End     = 64499,
+                        End     = 133649,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -88,7 +88,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 133650,
-                        End     = 69074,
+                        End     = 138224,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -96,7 +96,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 138225,
-                        End     = 90674,
+                        End     = 159824,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -104,7 +104,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 159825,
-                        End     = 95624,
+                        End     = 164774,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -112,7 +112,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 164775,
-                        End     = 116249,
+                        End     = 185399,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -120,63 +120,15 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 185400,
-                        End     = 120974,
+                        End     = 190124,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 121125,
-                        End     = 139874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 139875,
-                        End     = 143999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 144000,
-                        End     = 163199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 163200,
-                        End     = 167699,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 167700,
-                        End     = 172874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 172875,
-                        End     = 187124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 190125,
-                        End     = 121724,
+                        End     = 208874,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -184,7 +136,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 208875,
-                        End     = 148499,
+                        End     = 212999,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -192,7 +144,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 213000,
-                        End     = 145574,
+                        End     = 232199,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -200,7 +152,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 232200,
-                        End     = 165674,
+                        End     = 236699,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -208,7 +160,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 236700,
-                        End     = 169199,
+                        End     = 241874,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -216,7 +168,7 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 241875,
-                        End     = 175349,
+                        End     = 256124,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     },
@@ -224,7 +176,55 @@ namespace Aaru.Tests.Images.UltraISO
                     {
                         Session = 1,
                         Start   = 256125,
-                        End     = 191999,
+                        End     = 256874,
+                        Pregap  = 18446744073709482466,
+                        Flags   = 0
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 256875,
+                        End     = 265649,
+                        Pregap  = 18446744073709482466,
+                        Flags   = 0
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 265650,
+                        End     = 267374,
+                        Pregap  = 18446744073709482466,
+                        Flags   = 0
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 267375,
+                        End     = 269999,
+                        Pregap  = 18446744073709482466,
+                        Flags   = 0
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 270000,
+                        End     = 271649,
+                        Pregap  = 18446744073709482466,
+                        Flags   = 0
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 271650,
+                        End     = 274274,
+                        Pregap  = 18446744073709482466,
+                        Flags   = 0
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 274275,
+                        End     = 279299,
                         Pregap  = 18446744073709482466,
                         Flags   = 0
                     }
@@ -235,8 +235,8 @@ namespace Aaru.Tests.Images.UltraISO
                 TestFile      = "report_audiocd.nrg",
                 MediaType     = MediaType.CDDA,
                 Sectors       = 247073,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
+                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
                 SubchannelMD5 = "UNKNOWN",
                 Tracks = new[]
                 {
@@ -315,40 +315,40 @@ namespace Aaru.Tests.Images.UltraISO
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 154222,
-                        End     = 170900,
+                        Start   = 154072,
+                        End     = 170750,
                         Pregap  = 0,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 170901,
-                        End     = 186688,
+                        Start   = 170751,
+                        End     = 186538,
                         Pregap  = 0,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 186689,
-                        End     = 201948,
+                        Start   = 186539,
+                        End     = 201798,
                         Pregap  = 0,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 201949,
-                        End     = 224598,
+                        Start   = 201799,
+                        End     = 224448,
                         Pregap  = 0,
                         Flags   = 0
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 224599,
-                        End     = 247222,
+                        Start   = 224449,
+                        End     = 247072,
                         Pregap  = 0,
                         Flags   = 0
                     }
@@ -359,8 +359,8 @@ namespace Aaru.Tests.Images.UltraISO
                 TestFile      = "report_cdrom.nrg",
                 MediaType     = MediaType.CDROM,
                 Sectors       = 254265,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
+                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
                 SubchannelMD5 = "UNKNOWN",
                 Tracks = new[]
                 {
@@ -379,8 +379,8 @@ namespace Aaru.Tests.Images.UltraISO
                 TestFile      = "report_cdrw.nrg",
                 MediaType     = MediaType.CDROM,
                 Sectors       = 308224,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
+                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
                 SubchannelMD5 = "UNKNOWN",
                 Tracks = new[]
                 {
@@ -399,14 +399,14 @@ namespace Aaru.Tests.Images.UltraISO
                 TestFile  = "report_dvdram_v2.nrg",
                 MediaType = MediaType.DVDROM,
                 Sectors   = 471090,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
+                MD5       = "35cb08dd5fedfb8e9ad2918292e51791",
+                LongMD5   = "35cb08dd5fedfb8e9ad2918292e51791",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 18446744073709551466,
+                        Start   = 0,
                         End     = 471089,
                         Pregap  = 0
                     }
@@ -417,14 +417,14 @@ namespace Aaru.Tests.Images.UltraISO
                 TestFile  = "report_dvd-r+dl.nrg",
                 MediaType = MediaType.DVDROM,
                 Sectors   = 3455920,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
+                MD5       = "1cd9b9be5c5e337c5e6576156b84b726",
+                LongMD5   = "1cd9b9be5c5e337c5e6576156b84b726",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 18446744073709551466,
+                        Start   = 0,
                         End     = 3455919,
                         Pregap  = 0
                     }
@@ -435,14 +435,14 @@ namespace Aaru.Tests.Images.UltraISO
                 TestFile  = "report_dvdrom.nrg",
                 MediaType = MediaType.DVDROM,
                 Sectors   = 2146357,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
+                MD5       = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
+                LongMD5   = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 18446744073709551466,
+                        Start   = 0,
                         End     = 2146356,
                         Pregap  = 0
                     }
@@ -452,9 +452,9 @@ namespace Aaru.Tests.Images.UltraISO
             {
                 TestFile      = "report_enhancedcd.nrg",
                 MediaType     = MediaType.CDPLUS,
-                Sectors       = 292066,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
+                Sectors       = 303316,
+                MD5           = "31d07fe62a6505c1d15a88d2c264f3b5",
+                LongMD5       = "916333b50640479f0c989997bb6de629",
                 SubchannelMD5 = "UNKNOWN",
                 Tracks = new[]
                 {
@@ -464,7 +464,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 0,
                         End     = 15660,
                         Pregap  = 150,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -472,7 +472,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 15661,
                         End     = 33958,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -480,7 +480,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 33959,
                         End     = 51329,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -488,7 +488,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 51330,
                         End     = 71972,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -496,7 +496,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 71973,
                         End     = 87581,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -504,7 +504,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 87582,
                         End     = 103304,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -512,7 +512,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 103305,
                         End     = 117690,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -520,7 +520,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 117691,
                         End     = 136166,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -528,45 +528,45 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 136167,
                         End     = 153417,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 153568,
-                        End     = 167081,
+                        Start   = 153418,
+                        End     = 166931,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 167082,
-                        End     = 187262,
+                        Start   = 166932,
+                        End     = 187112,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 187263,
-                        End     = 201590,
+                        Start   = 187113,
+                        End     = 201440,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
-                        Start   = 201591,
-                        End     = 222929,
+                        Start   = 201441,
+                        End     = 222779,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 2,
-                        Start   = 256021,
-                        End     = 325456,
+                        Start   = 234030,
+                        End     = 303315,
                         Pregap  = 150,
                         Flags   = 4
                     }
@@ -576,9 +576,9 @@ namespace Aaru.Tests.Images.UltraISO
             {
                 TestFile      = "test_multi_karaoke_sampler.nrg",
                 MediaType     = MediaType.CDROMXA,
-                Sectors       = 329008,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
+                Sectors       = 329158,
+                MD5           = "f09312ba25a479fb81912a2965babd22",
+                LongMD5       = "f48603d11883593f45ec4a3824681e4e",
                 SubchannelMD5 = "UNKNOWN",
                 Tracks = new[]
                 {
@@ -588,15 +588,15 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 0,
                         End     = 1736,
                         Pregap  = 150,
-                        Flags   = 0
+                        Flags   = 4
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 1737,
-                        End     = 32748,
+                        End     = 32598,
                         Pregap  = 150,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -604,7 +604,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 32749,
                         End     = 52671,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -612,7 +612,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 52672,
                         End     = 70303,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -620,7 +620,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 70304,
                         End     = 100097,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -628,7 +628,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 100098,
                         End     = 119760,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -636,7 +636,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 119761,
                         End     = 136998,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -644,7 +644,7 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 136999,
                         End     = 155789,
                         Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
@@ -652,63 +652,63 @@ namespace Aaru.Tests.Images.UltraISO
                         Start   = 155790,
                         End     = 175825,
                         Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175732,
-                        End     = 206366,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206367,
-                        End     = 226355,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226356,
-                        End     = 244260,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244261,
-                        End     = 273870,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273871,
-                        End     = 293657,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293658,
-                        End     = 310616,
-                        Pregap  = 0,
-                        Flags   = 0
+                        Flags   = 2
                     },
                     new TrackInfoTestExpected
                     {
                         Session = 1,
                         Start   = 175826,
-                        End     = 194272,
+                        End     = 206460,
                         Pregap  = 0,
-                        Flags   = 4
+                        Flags   = 2
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 206461,
+                        End     = 226449,
+                        Pregap  = 0,
+                        Flags   = 2
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 226450,
+                        End     = 244354,
+                        Pregap  = 0,
+                        Flags   = 2
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 244355,
+                        End     = 273964,
+                        Pregap  = 0,
+                        Flags   = 2
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 273965,
+                        End     = 293751,
+                        Pregap  = 0,
+                        Flags   = 2
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 293752,
+                        End     = 310710,
+                        Pregap  = 0,
+                        Flags   = 2
+                    },
+                    new TrackInfoTestExpected
+                    {
+                        Session = 1,
+                        Start   = 310711,
+                        End     = 329157,
+                        Pregap  = 0,
+                        Flags   = 2
                     }
                 }
             }
diff --git a/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs b/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
index c694d4ae2..6fddfbbfa 100644
--- a/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
+++ b/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
@@ -51,7 +51,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked
                 SectorSize    = 2352,
                 MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
                 LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "2dc7b6159f8ba4fc8c1c58407d7741ba",
+                SubchannelMD5 = "e68088c7f1236c2304778e976057bd6e",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -176,7 +176,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked
                 SectorSize    = 2048,
                 MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
                 LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "5bdb9b11d8bc01867f629134ee635f90",
+                SubchannelMD5 = "8ed5c39d7435aeac23e77478625f14f1",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -197,7 +197,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked
                 SectorSize    = 2048,
                 MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
                 LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "2cee3bd721e3ecee6f426cbe7c7026c2",
+                SubchannelMD5 = "0ba3fa223e887fb955458fc7b40b0396",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -218,7 +218,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked
                 SectorSize    = 2048,
                 MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
                 LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "7e39b9ba733af2efefcc4297ec01e66e",
+                SubchannelMD5 = "eaf6dcfb86e9aca9856d736f3b04c765",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected
@@ -237,9 +237,9 @@ namespace Aaru.Tests.Images.cdrdao.cooked
                 MediaType     = MediaType.CDROM,
                 Sectors       = 329008,
                 SectorSize    = 2048,
-                MD5           = "d38c92fe94f3c3ac3c7799ff9866e46b",
-                LongMD5       = "40b4ea8170056ea27190fd0bdaec3a6c",
-                SubchannelMD5 = "24d557ef2fafe96991d9a15474e27eae",
+                MD5           = "f09312ba25a479fb81912a2965babd22",
+                LongMD5       = "f48603d11883593f45ec4a3824681e4e",
+                SubchannelMD5 = "7ac088d8a737d8d39b1cced86d11c7b5",
                 Tracks = new[]
                 {
                     new TrackInfoTestExpected