v2.0.x: minor test refactor