Merge test utility classes
There are too few methods to justify separate classes.