Drastically improve test performance