Test refactoring from class

This eliminates the extra object creation. It isn't overly
aggressive in eliminating duplication and I'm OK with that in
these tests. I think the duplication add to the readability/understanding.