[MRG + 1] Speed up common tests

Faster tests, on top of #3415