Minor cleanup in Test.hs