reduce duplication in tests
6 files changed