Merge "Factor out some common test code to a new test_utils library."