cleaning up imports of test-suite.hs