more refactoring of test data patterns