Testing tools improvements (no impact on draft)
6 files changed