[Git][ghc/ghc][wip/spj-reinstallable-base2] 5 commits: fix tests to do with imports and api