That would help avoid the duplication present in the tests, I think.