Relayout test. Fix Cabal test.