diff --git a/tests/UnitTest.hs b/tests/UnitTest.hs
index a31c9bf..08a35d9 100644
--- a/tests/UnitTest.hs
+++ b/tests/UnitTest.hs
@@ -69,32 +69,28 @@ testMalformed = TestCase $
 test2 = TestCase $
         either
         (assertFailure . displayException)
-        (\ trk -> case trk of
-          p:_ ->
-            assertEqual "matches lat/lon"
-             (Track.Pos 51.0 (-0.1))
-             (Track.pos p)
-          [] -> assertFailure "no points")
+        (\ (p:_) ->
+           assertEqual "matches lat/lon"
+           (Track.Pos 51.0 (-0.1))
+           (Track.pos p))
         (Track.parse onepoint)
 
 test3 = TestCase $
-        case Track.parse onepoint
-        of
-          Left err -> assertFailure (displayException err)
-          Right (p:ps) ->
-            assertEqual "matches attributes"
-             (Nothing, Nothing) (Track.elevation p, Track.cadence p)
-          Right [] -> assertFailure "no points"
+        either
+        (assertFailure . displayException)
+        (\ (p:_) ->
+           assertEqual "handles missing attributes"
+             (Nothing, Nothing) (Track.elevation p, Track.cadence p))
+        (Track.parse onepoint)
 
 test4 = TestCase $
-        case Track.parse onepointWithAttrs
-        of
-          Left err -> assertFailure (displayException err)
-          Right (p:ps) ->
-            assertEqual "matches attributes"
+        either
+        (assertFailure . displayException)
+        (\ (p:_) ->
+           assertEqual "handles attributes"
              (Just 25.2, Just 128, Just 55, Data.Time.UTCTime (toEnum 60606) 27299.779)
-             (Track.elevation p, Track.cadence p, Track.power p, Track.time p)
-          Right [] -> assertFailure "no points"
+             (Track.elevation p, Track.cadence p, Track.power p, Track.time p))
+        (Track.parse onepointWithAttrs)
 
 tests :: Test
 tests = TestList [