[Reviewer: Rob] Issue624

Merging in order to get this fix into tomorrow's release, but I have a couple of cleanup comments we should address.
We don't usually put this stuff in test_utils. Is there a reason you've put it here?