More clean up on test-suite.hs