ENH: Improve multiple tests