Remove some duplication in test data