Also, this PR actually is perfectly fine as is.  :)  I just have a tendency to prefer faster tests than slower, so feel free merge at any time if you don't feel like going to the effort of making this quick.