Again, I was trying to create something new that could be used with existing tests. I imagine that of we want all tests to use the API we are going to need it down the road, but I could remove it for now. Otoh, if this pull request's scope expands the way I think it is going to, we probably will end up needing something like it.